From: dwh@linuxprogrammer.org
Date: Thu, 13 May 2021 14:49:30 GMT
Subject: Re: [RFC doc] Tracking git.git
Message-ID: <20210513144930.GC11882@localhost>
In-Reply-To: <4591b3bd-1f35-55cb-6eb0-be97810d6e68@gmail.com>

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.

Cheers!
Dave