Questions tagged [smerge]
The smerge tag has no usage guidance.
8
questions
0
votes
1
answer
62
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-...
- 1,300
2
votes
1
answer
95
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 ...
- 1,300
1
vote
1
answer
105
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/...
- 1,300
3
votes
1
answer
332
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 ...
- 1,300
1
vote
1
answer
146
views
Merging diffs/hunks
When using ediff, I often get conflicts like this:
<<<<<<< variant A
added_function_1 () {
=======
added_function_2 () {
>>>>>>> variant B
<<<<&...
- 1,059
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 ...
- 185
4
votes
2
answers
1k
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 ...
- 6,008
1
vote
1
answer
363
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 ...
- 949