mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
To: Bagas Sanjaya <>
Cc: Git Users <>
Subject: Re: [RFC doc] Tracking git.git
Date: Thu, 13 May 2021 07:49:30 -0700	[thread overview]
Message-ID: <20210513144930.GC11882@localhost> (raw)
In-Reply-To: <>

On 13.05.2021 20:05, Bagas Sanjaya wrote:
>But tracking seen is more like tracking linux-next. We do NOT use git
>pull because often doing so will try to merge origin (upstream) with
>our local version, which are divergent and most likely will end with
>conflict.  Instead, we do git fetch first followed by resetting to
>upstream by git reset --hard origin/seen.
>Should the fact above be documented? And on what file the fact should
>be placed? In INSTALL?

I vote yes. I was trying out tracking the different branches and got
bitten by this very situation (tons of conflicts) when pulling seen.


  reply	other threads:[~2021-05-13 14:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-13 13:05 [RFC doc] Tracking git.git Bagas Sanjaya
2021-05-13 14:49 ` dwh [this message]
2021-05-13 20:12   ` Junio C Hamano
2021-05-13 22:47   ` Felipe Contreras

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210513144930.GC11882@localhost \ \ \ \

* 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.
Code repositories for project(s) associated with this public inbox

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 read-only IMAP folder(s) and NNTP newsgroup(s).