Questions tagged [emerge]

The tag has no usage guidance.

Filter by
Sorted by
Tagged with
0 votes
1 answer

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
0 answers

Merge org-mode files wirth emerge

I am using the excellent emerge-files command to merge two files regularly to handle conflict when syncing two computers. However when used on org-mode files, in the split-windows at the top that ...
TMat's user avatar
  • 95
0 votes
1 answer

How to efficiently merge 2 buffers which are partially overlapping?

Problem summary Imagine, you have 2 shopping lists: 1 huge one with hundreds of entries - list A, copied into buffer A 1 containing dozens of entries - list B, copied into buffer B Then: 75% of ...
starquake's user avatar
3 votes
1 answer

Is there a way to ask Emerge to "pick both"?

As far as I can see I only have the options to pick either A, or B, but not both. I occasionally want to pick both A and B. I know I can just go to the C buffer and edit the file by hand, but it ...
Stig Brautaset's user avatar
3 votes
1 answer

How do you hook up git to emerge through emacsclient?

I previously had the following script in a file called .emacs.d/emerge-for-git: #!/bin/sh emacs -Q $* And In my .gitconfig: [merge] tool = emerge [mergetool "emerge"] path = /home/rovanion/....
Rovanion's user avatar
  • 987