Lost changes after merge
Hello, I have a very strange issue described below: * Here is the tree before I merge via `git log --format="%h %p %d" -n 20 --all --graph`: https://upaste.de/9Pe * Here is the output of `git log --format="%h %p %d" -2 path/to/file`: a008c4d580 c61f96eb5d a274b6e7ca 67c1000ca3 * Here is the merge commands: git merge f087081868 # fix conflicts * Here is the tree after I merged via `git log --format="%h %p %d" -n 20 --all --graph`: https://upaste.de/8Bx * Here is the output of `git log --format="%h %p %d" -2 path/to/file`: a274b6e7ca 67c1000ca3 67c1000ca3 00bd5c8c89
Re: Lost changes after merge
After merged, the latest commit(a008c4d580) has lost and the second commit(a274b6e7ca) has been the latest, and changes missed too. 在 2018年10月29日 下午4:49:20, Gray King (graykin...@gmail.com(mailto:graykin...@gmail.com)) 写到: > > > Hello, > > I have a very strange issue described below: > > * Here is the tree before I merge via `git log --format="%h %p %d" -n 20 > --all --graph`: > > https://upaste.de/9Pe > > * Here is the output of `git log --format="%h %p %d" -2 path/to/file`: > > a008c4d580 c61f96eb5d > a274b6e7ca 67c1000ca3 > > * Here is the merge commands: > > git merge f087081868 > # fix conflicts > > * Here is the tree after I merged via `git log --format="%h %p %d" -n 20 > --all --graph`: > > https://upaste.de/8Bx > > > * Here is the output of `git log --format="%h %p %d" -2 path/to/file`: > > a274b6e7ca 67c1000ca3 > 67c1000ca3 00bd5c8c89
Re: Lost changes after merge
Sorry, seems the link has been expired, here is the new one: * 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 在 2018年10月29日 下午10:18:07, Jeff King (p...@peff.net(mailto:p...@peff.net)) 写到: > On Mon, Oct 29, 2018 at 09:49:20AM +0100, Gray King wrote: > > > Hello, > > > > I have a very strange issue described below: > > > > * Here is the tree before I merge via `git log --format="%h %p %d" -n > > 20 --all --graph`: > > > > https://upaste.de/9Pe > > FWIW, neither this nor the other paste link in your email seem to work > for me (which makes it hard to comment on the rest of the email). > > -Peff
