* git-mergetool to be used for rebases as well?
@ 2017-01-10 18:54 Stefan Beller
2017-01-10 20:26 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Beller @ 2017-01-10 18:54 UTC (permalink / raw)
To: git; +Cc: Stefan Beller
An internal user report running on origin/next:
$ git pull
From .
* branch ... -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: ...
Applying: ...
Using index info to reconstruct a base tree...
CONFLICT (content): ....
error: Failed to merge in the changes.
Patch failed at 0002...
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
$ git status
rebase in progress; onto ...
You are currently rebasing branch '...' on '...'.
Changes to be committed:
modified: ...
Unmerged paths:
both modified: ...
$ git mergetool
No files need merging
$ git diff <file name>
diff --cc <file name>
index ...
--- a/file
+++ b/file
@@@ ...
content
++<<<<<<< HEAD
+ content
++=======
+ content
++>>>>>>> other commit
content
The mergetool used to work apparently, but stopped for rebases.
I noticed in neither t7610-mergetool.sh nor any rebase test the combination of
rebase and mergetool is tested.
Stefan
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git-mergetool to be used for rebases as well?
2017-01-10 18:54 git-mergetool to be used for rebases as well? Stefan Beller
@ 2017-01-10 20:26 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2017-01-10 20:26 UTC (permalink / raw)
To: Stefan Beller; +Cc: git
Stefan Beller <sbeller@google.com> writes:
> $ git status
> rebase in progress; onto ...
> You are currently rebasing branch '...' on '...'.
>
> Changes to be committed:
> modified: ...
>
> Unmerged paths:
> both modified: ...
>
> $ git mergetool
> No files need merging
> $ git diff <file name>
> diff --cc <file name>
> index ...
> --- a/file
> +++ b/file
> @@@ ...
> content
> ++<<<<<<< HEAD
> + content
> ++=======
> + content
> ++>>>>>>> other commit
> content
>
>
> The mergetool used to work apparently, but stopped for rebases.
> I noticed in neither t7610-mergetool.sh nor any rebase test the combination of
> rebase and mergetool is tested.
The above redacts too much to be useful for guessing, but are you by
any chance being hit by a recent regression, i.e. have rerere enabled
and running mergetool from a subdirectory?
See <20170109232941.43637-15-hansenr@google.com> (and previous
rounds).
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-01-10 20:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-10 18:54 git-mergetool to be used for rebases as well? Stefan Beller
2017-01-10 20:26 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).