$ git log main github/main --graph --decorate -n 3 * commit b73d3e132f9638afbf5b98b0c278ed6b93a3ae50 (HEAD -> main) | Author: Erwin Villejo <erwin.villejo@xxxxxxxxx> | Date: Mon Nov 15 15:22:53 2021 +0700 | | init activity api | * commit d370bf256a756a777c14609c8ad4184aa7e9e60f (github/main) | Author: Erwin Villejo <erwin.villejo@xxxxxxxxx> | Date: Sat Nov 13 19:18:45 2021 +0700 | | refactor partitioning migration | * commit 5124511d287f1a6c384ff9766fdcc0e3e07043e8 | Author: Erwin Villejo <erwin.villejo@xxxxxxxxx> | Date: Mon Nov 8 17:24:19 2021 +0700 | | wip pg $ git remote -v github git@xxxxxxxxxx:erwinv/database-sandbox.git (fetch) github git@xxxxxxxxxx:erwinv/database-sandbox.git (push) Link to the [upstream branch on GitHub](https://github.com/erwinv/database-sandbox/commits/main) so you could see for yourself that my local is ahead of upstream and that the upstream has no commits ahead of local. Best regards, Erwin On Mon, Nov 15, 2021 at 4:19 PM Erwin Villejo <erwinvillejo@xxxxxxxxx> wrote: > > > 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
