From: Bagas Sanjaya <bagasdotme@gmail.com>
To: Erwin Villejo <erwinvillejo@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git pull bug report
Date: Mon, 15 Nov 2021 16:12:24 +0700 [thread overview]
Message-ID: <0bd032c1-f90b-1892-693c-518a01b3b671@gmail.com> (raw)
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
next prev parent reply other threads:[~2021-11-15 9:12 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-15 8:42 git pull bug report Erwin Villejo
2021-11-15 8:54 ` Bagas Sanjaya
2021-11-15 8:56 ` Erwin Villejo
2021-11-15 9:12 ` Bagas Sanjaya [this message]
2021-11-15 9:19 ` Erwin Villejo
2021-11-15 9:39 ` Erwin Villejo
2021-11-15 18:15 ` Bryan Turner
2021-11-15 18:22 ` Erwin Villejo
2021-11-15 17:56 ` Bryan Turner
2021-11-15 20:40 ` Junio C Hamano
[not found] ` <CADL96rsnUCXchnrTa1rZ7WgJz2kDA-3TzeOiCy4AXNFdXtTmng@mail.gmail.com>
2021-11-16 1:43 ` Erwin Villejo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0bd032c1-f90b-1892-693c-518a01b3b671@gmail.com \
--to=bagasdotme@gmail.com \
--cc=erwinvillejo@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).