[mythtv] [mythtv-commits] mythtv commit: fbe4969 by Raymond Wagner (wagnerrp)

[Raymond Wagner]

On 12/7/2010 06:37, Simon Kenyon wrote:
> On 07/12/2010 09:10, MythTV wrote:
>> Merge branch 'master' of github.com:MythTV/mythtv
> what is generating this log message?
> it does not describe the change
> is this just a function of the way git works?

Basically, if you look at the network graph, everything makes sense.  In 
git, you commit to your local branch, and then push to the remote 
branch.  If two people are making commits at the same time, you now have 
two separate branches.  The one who pushes first can just push straight 
to the repository.  The one who pushes second must reconcile their 
commits with the other person, resulting in these automated 'merge' 
commits, and the appearance of a second temporary branch.