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

Why sometimes branch merging is associated with this commit: Merge remote-tracking branch 'remotes/p4/HEAD'

From
YYuri <yuri@rawbw.com>
Date
Oct 20, 2023, 19:46 UTC
Message-ID
<dd4befe1-dea7-b27d-720d-9f1616b129ee@tsoft.com>
I use git-p4 to use the perforce repository through git.
There are 3 branches:
* master
   remotes/p4/HEAD -> p4/master
   remotes/p4/master
git-p4 syncs remotes/p4/HEAD with the perforce repository.
Then the user (me) needs to merge remotes/p4/HEAD into master.

Initially such merge doesn't cause "Merge remote-tracking branch 'remotes/p4/HEAD'" commits.

But then, after several cycles of submit/sync something happens, and git forces me to commit with the "Merge remote-tracking branch 'remotes/p4/HEAD'" comment.

What makes the merge from remotes/p4/HEAD into master to require "Merge remote-tracking branch 'remotes/p4/HEAD'"?

What does this mean?
What is changed in remotes/p4/HEAD or master that later requires this?

How to eliminate the need for "Merge remote-tracking branch 'remotes/p4/HEAD'"?

Thanks,
Yuri
Next: Thomas Guyot
Message 1 of 2 in “Why sometimes branch merging is associated with this commit: Merge remote-tracking branch 'remotes/p4/HEAD'”
  1. YuriOct 20, 2023
  2. Thomas GuyotOct 26, 2023

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.