git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [RFC doc] Tracking git.git

From
Ddwh@linuxprogrammer.org <dwh@linuxprogrammer.org>
Date
May 13, 2021, 14:49 UTC
Message-ID
<20210513144930.GC11882@localhost>
In-Reply-To
<4591b3bd-1f35-55cb-6eb0-be97810d6e68@gmail.com>
On 13.05.2021 20:05, Bagas Sanjaya wrote:
Show 8 quoted lines
>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

Previous: Bagas SanjayaNext: Junio C Hamano
Message 2 of 4 in “[RFC doc] Tracking git.git”
  1. Bagas SanjayaMay 13, 2021
  2. dwh@linuxprogrammer.orgMay 13, 2021
  3. Junio C HamanoMay 13, 2021
  4. Felipe ContrerasMay 13, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.