[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: Lost changes after merge
From:       Brandon McCaig <bamccaig () gmail ! com>
Date:       2018-10-31 15:30:45
Message-ID: 20181031153045.iirgzwwncogxgwlu () test-chamber-21 ! localdomain
[Download RAW message or body]


Gray:

On Tue, Oct 30, 2018 at 03:46:28AM +0100, Gray King wrote:
> * Before merge run `git log --format="%h %p %d" -n 20 --all --graph`:
> 
> https://cfp.vim-cn.com/cbfq6
> 
> * After merged run `git log --format="%h %p %d" -n 20 --all --graph`:
> 
> https://cfp.vim-cn.com/cbfq7

I also cannot see anything wrong here. The two commits you
mentioned earlier are not in either paste, as was already stated.
It might help us understand if you are more explicit about what
you think is wrong. Maybe verify that your pastes have captured
all of the necessary information to understand the problem.

The only other thing that I note is that 6d6ed669d1 and
3c792ffaf0 appear to be merging the same two parents, so
logically they should be identical (unless merge conflicts were
resolved in different ways). Is that related to the issue? Was
one of the merges done incorrectly, and you're trying to fix it?
Or are you just confused about how you got into this state in the
first place?

Regards,


-- 
Brandon McCaig <bamccaig@gmail.com> <bambams@castopulence.org>
Castopulence Software <https://www.castopulence.org/>
Blog <http://www.bambams.ca/>
perl -E '$_=q{V zrna gur orfg jvgu jung V fnl. }.
q{Vg qbrfa'\''g nyjnlf fbhaq gung jnl.};
tr/A-Ma-mN-Zn-z/N-Zn-zA-Ma-m/;say'


["signature.asc" (application/pgp-signature)]

[prev in list] [next in list] [prev in thread] [next in thread]