{"thread":{"id":"44847","subject":"git-mergetool to be used for rebases as well?","startedAt":"2017-01-10T18:54:53Z","lastAt":"2017-01-10T20:28:58Z","messageCount":2,"participants":["Stefan Beller","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"309150","messageId":"20170110185421.2638-1-sbeller@google.com","threadId":"44847","inReplyTo":null,"subject":"git-mergetool to be used for rebases as well?","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2017-01-10T18:54:21Z","receivedAt":"2017-01-10T18:54:53Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"An internal user report running on origin/next:\n\n    $ git pull\n        From .\n         * branch                ... -> FETCH_HEAD\n        First, rewinding head to replay your work on top of it...\n        Applying: ...\n        Applying: ...\n        Using index info to reconstruct a base tree...\n        CONFLICT (content): ....\n        error: Failed to merge in the changes.\n        Patch failed at 0002...\n        The copy of the patch that failed is found in: .git/rebase-apply/patch\n\n        When you have resolved this problem, run \"git rebase --continue\".\n        If you prefer to skip this patch, run \"git rebase --skip\" instead.\n        To check out the original branch and stop rebasing, run \"git rebase --abort\".\n    $ git status\n        rebase in progress; onto ...\n        You are currently rebasing branch '...' on '...'.\n\n        Changes to be committed:\n                modified:   ...\n\n        Unmerged paths:\n                both modified:   ...\n\n    $ git mergetool\n        No files need merging\n    $ git diff <file name>\n        diff --cc <file name>\n        index ...\n        --- a/file\n        +++ b/file\n        @@@ ...\n          content\n        ++<<<<<<< HEAD\n         +  content\n        ++=======\n        +   content\n        ++>>>>>>> other commit\n        content\n\n\nThe mergetool used to work apparently, but stopped for rebases.\nI noticed in neither t7610-mergetool.sh nor any rebase test the combination of\nrebase and mergetool is tested.\n\nStefan\n\n\n"},{"id":"309159","messageId":"xmqqvatmr794.fsf@gitster.mtv.corp.google.com","threadId":"44847","inReplyTo":"20170110185421.2638-1-sbeller@google.com","subject":"Re: git-mergetool to be used for rebases as well?","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-01-10T20:26:47Z","receivedAt":"2017-01-10T20:28:58Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller <sbeller@google.com> writes:\n\n>     $ git status\n>         rebase in progress; onto ...\n>         You are currently rebasing branch '...' on '...'.\n>\n>         Changes to be committed:\n>                 modified:   ...\n>\n>         Unmerged paths:\n>                 both modified:   ...\n>\n>     $ git mergetool\n>         No files need merging\n>     $ git diff <file name>\n>         diff --cc <file name>\n>         index ...\n>         --- a/file\n>         +++ b/file\n>         @@@ ...\n>           content\n>         ++<<<<<<< HEAD\n>          +  content\n>         ++=======\n>         +   content\n>         ++>>>>>>> other commit\n>         content\n>\n>\n> The mergetool used to work apparently, but stopped for rebases.\n> I noticed in neither t7610-mergetool.sh nor any rebase test the combination of\n> rebase and mergetool is tested.\n\nThe above redacts too much to be useful for guessing, but are you by\nany chance being hit by a recent regression, i.e. have rerere enabled\nand running mergetool from a subdirectory?\n\nSee <20170109232941.43637-15-hansenr@google.com> (and previous\nrounds).\n"}]}