From: Bagas Sanjaya <bagasdotme@gmail.com>
Date: Mon, 15 Nov 2021 09:12:24 GMT
Subject: Re: git pull bug report
Message-ID: <0bd032c1-f90b-1892-693c-518a01b3b671@gmail.com>
In-Reply-To: <CADL96rvWidDUEChJX8JCruUKjaOWqXrZn6-sG0EYb82_k_LTsA@mail.gmail.com>

On 15/11/21 15.56, Erwin Villejo wrote:
> There is nothing to reconcile since the branches have not diverged:
> local is ahead of upstream. So I think it is a bug, no?

You have the situation like:

---o---a (your mainline)
    \
     b---c---d (remote mainline)

Your mainline only have one commit ahead of base point `o`, while the remote 
mainline have three commits ahead of `o` but unrelated. In this sense, your and 
remote mainline is divergent - you need to either merge or rebase.

Next time, keep your mainline pristine (don't commit any local changes on it, 
instead branch to the topic branch and commit there).

-- 
An old man doll... just what I always wanted! - Clara