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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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






[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux