Web lists-archives.com

Re: Lost changes after merge




The commits you mentioned are not present on the new pastes.

On Tue, Oct 30, 2018 at 03:46:28AM +0100, Gray King wrote:
> 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`:
>

One thing I noticed, is that you're using %p with --graph. And --graph
enables parent rewriting. Which may surprise you if you don't know what
it does.

But apart from that, and assuming you only did `git merge f087081868`
everything looks normal between those two pastes.

Cheers,
Rafael Ascensão