Can't discard changes to unmerged files about magit HOT 8 CLOSED

I just bumped into that problem and will look into your proposed solution.

from magit.

@dudebout does this issue still exist?

from magit.

You can stage them (without actually resolving the merge conflicts) and once staged delete them.

Downgrading to feature-request for doing it in one step.

from magit.

Staging & then discarding is certainly possible, but having gone through a lot of such situations recently I can safely say that it is annoying and error-prone. If your merge (or re-base or whatever) involves a lot of files then having to add an unstaged part first means that I also have to search for where the newly added file to be discarded shows up in the list of staged changes. Highly annoying, and like I said, a potential source for quick mistakes (ooops, I've moved one line down too much and discarded the wrong item).

Consider this a +1 to this feature request. I'd even consider this a bug as magit is doing stuff that git fails with 100% of the time.

from magit.

As noted in #552 we also have to take care of the deleted by us/them states. I consider this a special case of the above (well I hope :-)

from magit.

Unfortunately it is impossible to stage a 'deleted by us' file because stage uses '-u' option for git add. This makes 'two step' process of removing unstaged file described above impossible for such files.

from magit.

I have implemented this on the next branch.

k on an unmerged file now offers to pick either side. The command magit-checkout-stage can also be used directly, e.g. to restore the conflict.

from magit.

you can reset the file and later on can checkout from the file you want.

git reset builtin/fetch.c

git checkout builtin/fetch.c

I hope these will solve the problem.

from magit.