What's the simplest way to edit conflicted files in one go when using git and an editor like Vim or textmate? What's the simplest way to edit conflicted files in one go when using git and an editor like Vim or textmate? git git

What's the simplest way to edit conflicted files in one go when using git and an editor like Vim or textmate?


git editor conflict

Here are a pair of aliases I have in my gitconfig, taken from the git wiki:

edit-unmerged = \    "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; vim `f`"add-unmerged = \    "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; git add `f`"

Should do what you want!

git editor conflict

Shortest I can think of:

vim `git status|grep 'both modified'|cut -d: -f2`

git editor conflict

Are you aware of the git mergetool command ? That doesn't open all the files in one go, but iterate on all needed files, which might be only what you need. You can even use vim to do the merge

git mergetool --tool=vimdiff

Recent Posts
How can I color dots in a xy scatterplot according to column value?
How to update a claim in ASP.NET Identity?
What does {0} mean when initializing an object?
Accessing members of items in a JSONArray with Java
How to log SQL statements in Spring Boot?
Powershell Get-WebSite name parameter is ignored
How to detect scroll to bottom of html element
Java synchronized method
How to test controllers with CodeIgniter?
Detect Visual Composer
Matplotlib: Specify format of floats for tick labels
Rails join a list of strings with commas and "and" before the last