Skip to main content
Share Your Experience: Take the 2024 Developer Survey

Questions tagged [smerge]

The tag has no usage guidance.

Filter by
Sorted by
Tagged with
3 votes
1 answer
108 views

When merging conflicts in the smerge mode, how to select "mine" for all conflicts in the file?

When merging conflicts In smerge mode, how to select "mine" for all conflicts? At the moment I only know how to do it one by one with smerge-use-lower or C-c ^ l. Update: a possible solution ...
qazwsx's user avatar
  • 601
0 votes
1 answer
42 views

Automatically merge files

When opening an A file, I'd like to check if there's a conflicting file B that follows some naming convention. If this happens, I'd like to transparently merge the content of B in A, keeping an ...
cidra's user avatar
  • 139
0 votes
1 answer
83 views

How can I apply `smerge-refine` for all conflicts by default using `smerge`?

I am using smerge to resolve conflicts in my git repo. I use C-c ^ n to jump to the next conflict. When I view the conflict, for all, I want to apply smerge-refine automatically. Workflow should be: C-...
alper's user avatar
  • 1,380
2 votes
1 answer
105 views

How to disable `flycheck` while merging Git conflicts

I am using following solution for merge Git conflicts in Emacs, which is based on smerge. During merging smerge-mode creates <<<<<<< HEAD , ||||||||| parent lines for conflict ...
alper's user avatar
  • 1,380
1 vote
1 answer
107 views

finding git conflict in the same buffer if cursor is at end of the buffer

I am using next-conflict to detect is there any git conflict, using following answer: Jump to next merge conflict in project using Magit and Smerge. I experience that if I am at the end of the file/...
alper's user avatar
  • 1,380
3 votes
1 answer
360 views

Is it possible to apply `smerge-keep-mine` for all the conflicts by using a single keybinding?

I am using smerge to resolve conflicts in order to apply merge. I am applying one by one for smerge-keep-mine to all conflicts, which I belive equivalent for git merge --strategy-option ours [Q] Is it ...
alper's user avatar
  • 1,380
1 vote
1 answer
157 views

Merging diffs/hunks

When using ediff, I often get conflicts like this: <<<<<<< variant A added_function_1 () { ======= added_function_2 () { >>>>>>> variant B <<<<&...
Nova's user avatar
  • 1,119
7 votes
2 answers
1k views

Key binding for Smerge

I'm trying to change the key bindings 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 ...
M-Gregoire's user avatar
4 votes
2 answers
2k 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 ...
Matthew Piziak's user avatar
1 vote
1 answer
374 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 ...
Robin Green's user avatar