Allow for accepting ours/theirs for unstaged files from a merge
joelpryde opened this issue · comments
Apparently emacs magit has this behavior for handling merges that would be super handy:
1. Merge one branch into another and encounter a conflict
2. In the Magit buffer, there will be sections for Merging master, and Unstaged changes, Staged changes. The conflicted file is in Unstaged changes
3. On the line with the conflicted file, hit k to discard the changes (i.e., the conflicted changes)
4. In the minibuffer, you will see the answer:
For <conflicted file> checkout: [o]ur stage, [t]heir stage, [c]onflict, or [C-g] to abort
https://emacs.stackexchange.com/a/19319
Not sure how hard it would be to add this but I would use it many times a day! Loving Edamagit btw, so thank you!
Personally, I never used this part of magit. Thank you for bringing it to my attention.
In the meanwhile, before this gets added,...
With edamagit I've been pretty happy using the built-in conflict resolution UI in vscode. By just pressing enter on the files in the magit status view when there is a conflict, I'm taken straight to the conflict resolution UI for that change.
Didn't realize that was possible! I'll give that a go in the interim. Thanks.