> the remote mainline have three commits ahead Where did you get this info? This is not true in my case. * local is ahead of upstream. confirmed by `git status`: ``` $ git status On branch main Your branch is ahead of 'github/main' by 1 commit. (use "git push" to publish your local commits) ``` If remote was ahead, `git status` would say so. And this is my personal repo in GitHub with only me as the sole developer/contributor so I can assure you that the upstream has no commits ahead of my local. Best regards, Erwin On Mon, Nov 15, 2021 at 4:12 PM Bagas Sanjaya <bagasdotme@xxxxxxxxx> wrote: > > 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
