# how to automatically open conflicted files when "git rebase" encounter conflict 8 messages from 2022-03-18 to 2022-03-19. Participants: wuzhouhui, Junio C Hamano, Erik Cervin Edin, brian m. carlson. Thread: https://gitlist.dev/t/57581 ## wuzhouhui, 2022-03-18 02:00 Subject: how to automatically open conflicted files when "git rebase" encounter conflict Message-ID: URL: https://gitlist.dev/e/bc7b04de-17be-df86-1c93-792903eeec9b%40mails.ucas.ac.cn ``` 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? Thanks. ``` ## Junio C Hamano, 2022-03-18 04:11 Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict Message-ID: URL: https://gitlist.dev/e/xmqqtubvc32q.fsf%40gitster.g In-Reply-To: ``` wuzhouhui writes: > 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? > > Thanks. Perhaps take "git jump" from contrib/ and do $ GIT_EDITOR=vi git jump merge ``` ## Erik Cervin Edin, 2022-03-18 16:00 Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict Message-ID: URL: https://gitlist.dev/e/CA%2BJQ7M8_QiidajaWJpz3gFeUXiLMLiDA38W1mnWyxnMLJN3fpQ%40mail.gmail.com In-Reply-To: ``` On Fri, Mar 18, 2022 at 8:02 AM wuzhouhui 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 :/ ``` ## Erik Cervin Edin, 2022-03-18 16:01 Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict Message-ID: URL: https://gitlist.dev/e/CA%2BJQ7M-2kRnHrTCErTOY5O%3D4PCbRc7DWOHt1q5DxXmCu6z7K1A%40mail.gmail.com In-Reply-To: ``` On Fri, Mar 18, 2022 at 4:38 PM Junio C Hamano wrote: > Perhaps take "git jump" from contrib/ and do > > $ GIT_EDITOR=vi git jump merge This looks interesting. Thanks Junio ``` ## Junio C Hamano, 2022-03-18 18:24 Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict Message-ID: URL: https://gitlist.dev/e/xmqqpmmj9l11.fsf%40gitster.g In-Reply-To: ``` Erik Cervin Edin writes: > 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' Yeah, I forgot all about "git mergetool". I think that is the official answer to the original question. ``` ## brian m. carlson, 2022-03-18 20:14 Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict Message-ID: URL: https://gitlist.dev/e/YjToDb9Mz9Q9z4Bq%40camp.crustytoothpaste.net In-Reply-To: ``` On 2022-03-18 at 02:00:52, wuzhouhui 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? I agree that in the typical project with a few levels of directories this is a hassle. Fortunately, there are lots of ways to do this. The way I happen to do it is with an alias: [alias] conflicted = "!f() { git status -s | grep -E '^(DD|AA|.U|U.)' | cut -b4-; };f" and then I run this: git conflicted | xargs nvim-gtk To preempt someone pointing this out, you would want to use "git status --porcelain" for scripting instead of "git status -s", but I happen to know what I'm doing in this particular case (and have reasons for it) and can fix things if it breaks. You should probably use --porcelain. My approach also works less well if you have files with spaces or other characters special to the shell. That can be fixed with using NUL-terminated strings if that's a problem for you (it isn't on the projects I work on). -- brian m. carlson (he/him or they/them) Toronto, Ontario, CA ``` ## Junio C Hamano, 2022-03-18 21:25 Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict Message-ID: URL: https://gitlist.dev/e/xmqqv8wb6jhw.fsf%40gitster.g In-Reply-To: ``` "brian m. carlson" writes: > Fortunately, there are lots of ways to do this. The way I happen to do > it is with an alias: > > [alias] > conflicted = "!f() { git status -s | grep -E '^(DD|AA|.U|U.)' | cut -b4-; };f" > > and then I run this: > > git conflicted | xargs nvim-gtk > > To preempt someone pointing this out, you would want to use "git status > --porcelain" for scripting instead of "git status -s", but I happen to > know what I'm doing in this particular case (and have reasons for it) > and can fix things if it breaks. You should probably use --porcelain. I wonder if adding "--name-only" support to "ls-files" helps here. It would make the above git ls-files [-z] --name-only -u | xargs [-0] editor As your "grep -E" pattern indicates, "status" makes another comparison with HEAD that we do not even use, when we only need to list the unmerged paths in the index. There is no "--[no-]name-only", and "-s" (for obvious reasons) asks to show the mode, stage, and the object name information. When we added "-u", we said "if you are asking for conflicted paths, you of course want to know the stage information" without questioning the wisdom of that decision, especially as Linus and I were both in the mindset to produce a small building-block to be used in a script back then, and for a tool that deals with an unmerged index, having the path alone is not all that useful. But with time, we learn more needs out of our existing tools. ``` ## wuzhouhui, 2022-03-19 02:01 Subject: Re: how to automatically open conflicted files when "git rebase" encounter conflict Message-ID: <550558de-7847-ee2e-171b-1e03f2daf570@mails.ucas.ac.cn> URL: https://gitlist.dev/e/550558de-7847-ee2e-171b-1e03f2daf570%40mails.ucas.ac.cn In-Reply-To: ``` On 3/18/22 12:11, Junio C Hamano wrote: > wuzhouhui writes: > >> 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? >> >> Thanks. > Perhaps take "git jump" from contrib/ and do > > $ GIT_EDITOR=vi git jump merge Thanks everyone, The "git jump merge" satisfies my needs. ```