git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yuri <yuri@rawbw.com>
To: Git Mailing List <git@vger.kernel.org>
Subject: Why sometimes branch merging is associated with this commit: Merge remote-tracking branch 'remotes/p4/HEAD'
Date: Fri, 20 Oct 2023 12:46:35 -0700	[thread overview]
Message-ID: <dd4befe1-dea7-b27d-720d-9f1616b129ee@tsoft.com> (raw)

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



             reply	other threads:[~2023-10-20 19:46 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-20 19:46 Yuri [this message]
2023-10-26  3:23 ` Why sometimes branch merging is associated with this commit: Merge remote-tracking branch 'remotes/p4/HEAD' Thomas Guyot

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=dd4befe1-dea7-b27d-720d-9f1616b129ee@tsoft.com \
    --to=yuri@rawbw.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).