From: Renato Botelho <garga@freebsd.org>
Date: Fri, 24 Apr 2020 14:34:49 GMT
Subject: Re: Commit change disappeared from repository
Message-ID: <21fa350c-37df-18b3-b577-2d2cb49b784d@FreeBSD.org>
In-Reply-To: <7dec4168-9eed-7f89-e33c-db0b50157407@gmail.com>

On 24/04/20 10:21, Derrick Stolee wrote:
> On 4/23/2020 3:22 PM, Renato Botelho wrote:
>> Hello,
>>
>> I'm sending it here to devel list because after asking around at IRC and
>> also to friends we ended up with no reasonable explanation about what
>> happened, and it lead me to consider maybe it could be a bug (!?!?)
> 
> This is a common confusion with Git history. The best description of what
> is going on is [1], in my opinion.
> 
> [1] https://docs.microsoft.com/en-us/azure/devops/repos/git/git-log-history-simplification
> 
> There are other history options that will likely show the error.
> Specifically, run "git log --full-history --simplify-merges <path>" to
> do a full graph traversal and reduce the output as much as possible.
> 
> 99% of these cases are due to someone resolving a merge conflict incorrectly,
> and you'll find that merge with the "git log" command above.

Thank you for the explanation!

-- 
Renato Botelho