Questions tagged [smerge]
The smerge tag has no usage guidance.
4
questions
1
vote
1answer
41 views
Merging diffs/hunks
When using ediff, I often get conflicts like this:
<<<<<<< variant A
added_function_1 () {
=======
added_function_2 () {
>>>>>>> variant B
<<<<&...
2
votes
2answers
472 views
Keybinding for Smerge
I'm trying to change the keybindings to all the smerge commands. I added :
(setq smerge-command-prefix "\C-c v")
to my Emacs config. M-x customize smerge confirms that the Smerge Command Prefix is ^...
2
votes
2answers
446 views
Jump to next merge conflict in project using Magit and Smerge
When I am resolving merge conflicts with Magit and Smerge, is there a way for me to cycle through all merge conflicts in the project? Currently I can only move through them one file at a time.
I ...
1
vote
1answer
260 views
Resolve git merge conflict by applying diff hunk to different file
I have refactored a file by splitting into two files in one git branch, and someone else has made a different change to the original file on another git branch. This has produced a merge conflict in ...
