merge leaves a clean working copy behind; checkout refusals say too little issue #17 closed: completed andymccall opened this 1 month ago · 0 comments

After bookmark switch develop and merge feature/…, the merge said "run oxy checkout to update the working copy". The checkout then refused with "the working copy has changes", and status listed a path as removed (metalgear feedback item 3). It was not clear whether discarding was safe.

A merge should move a working copy that has no changes. A refused checkout should name what is in the way, and offer --carry.