On Fri, Mar 18, 2022 at 8:02 AM wuzhouhui <wuzhouhui14@xxxxxxxxxxxxxxxx> wrote: > > Hi > > When "git rebase" stopped due to conflict, I have to manually open > conflicted > file one by one and resolve conflict, and the typing file path is too > boring. > So, how to automatically open (e.g. use Vim) conflicted files? > Hi! I rebase quite a lot and my strategy is as follows git diff allows me to quickly overview the conflicted files and conflicts. Usually, I want to either take all *ours* (the stuff I've rebased onto) or *theirs* (the incoming rebased commit). To do this quickly I've developed a script (basically glue-code of git => sed) https://github.com/CervEdin/gut/blob/main/git-resolve.sh which can be invoked git resolve -o/t/b (--ours/theirs/both) 'pathspec' More information on the underlying implementation can be found in this stackoverflow answer https://stackoverflow.com/a/68498101/ The script is something I've developed for my own use and very much not bug free. Nevertheless, I personally find it efficiently covers the case of basic conflicts I encounter. In the situations of more complicated conflicts (as well as the functionality you request) can be invoked using git mergetool git mergetool -- 'pathspec' git mergetool --tool=vimdiff -- 'pathspec' That is unless you want to solely use vim without vimdiff. The main downside is that invoking mergetool is a bit slow :/
