Re: How to debug a "git merge"?

2018-03-19 Thread Derrick Stolee
On 3/14/2018 4:53 PM, Lars Schneider wrote: On 14 Mar 2018, at 18:02, Derrick Stolee wrote: On 3/14/2018 12:56 PM, Lars Schneider wrote: Hi, I am investigating a Git merge (a86dd40fe) in which an older version of a file won over the newer version. I try to understand why

Re: How to debug a "git merge"?

2018-03-15 Thread Elijah Newren
On Thu, Mar 15, 2018 at 7:09 AM, Jeff King wrote: > On Thu, Mar 15, 2018 at 10:51:27AM +0100, Lars Schneider wrote: >> Next time I won't stumble over this. I wonder if this is a common enough >> problem to do something about it? For instance what if `git log` (or just >> `git

Re: How to debug a "git merge"?

2018-03-15 Thread Jeff King
On Thu, Mar 15, 2018 at 10:51:27AM +0100, Lars Schneider wrote: > > Maybe a stupid question, but: did you make sure that the merge does > > indeed pick the wrong version of the file? The other option is that > > somebody mistakenly did a "checkout --ours" or similar while resolving > > the

Re: How to debug a "git merge"?

2018-03-15 Thread Lars Schneider
> On 14 Mar 2018, at 23:20, Jeff King wrote: > > On Wed, Mar 14, 2018 at 05:56:04PM +0100, Lars Schneider wrote: > >> I am investigating a Git merge (a86dd40fe) in which an older version of >> a file won over the newer version. I try to understand why this is the >> case. I

Re: How to debug a "git merge"?

2018-03-14 Thread Jeff King
On Wed, Mar 14, 2018 at 05:56:04PM +0100, Lars Schneider wrote: > I am investigating a Git merge (a86dd40fe) in which an older version of > a file won over the newer version. I try to understand why this is the > case. I can reproduce the merge with the following commands: > $ git checkout -b

Re: How to debug a "git merge"?

2018-03-14 Thread Lars Schneider
> On 14 Mar 2018, at 18:02, Derrick Stolee wrote: > > On 3/14/2018 12:56 PM, Lars Schneider wrote: >> Hi, >> >> I am investigating a Git merge (a86dd40fe) in which an older version of >> a file won over the newer version. I try to understand why this is the >> case. I can

Re: How to debug a "git merge"?

2018-03-14 Thread Derrick Stolee
On 3/14/2018 12:56 PM, Lars Schneider wrote: Hi, I am investigating a Git merge (a86dd40fe) in which an older version of a file won over the newer version. I try to understand why this is the case. I can reproduce the merge with the following commands: $ git checkout -b test a02fa3303 $

How to debug a "git merge"?

2018-03-14 Thread Lars Schneider
Hi, I am investigating a Git merge (a86dd40fe) in which an older version of a file won over the newer version. I try to understand why this is the case. I can reproduce the merge with the following commands: $ git checkout -b test a02fa3303 $ GIT_MERGE_VERBOSITY=5 git merge --verbose c1b82995c