Re: Commit change disappeared from repository
On 24/04/20 10:21, Derrick Stolee wrote:
Show 18 quoted lines
> 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