[mythtv] [mythtv-commits] mythtv commit: fbe4969 by Raymond Wagner (wagnerrp)
simon at koala.ie
Tue Dec 7 19:40:11 UTC 2010
On 12/07/10 18:09, Raymond Wagner wrote:
> 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.
i could see the two commits in the network but with no apparent
relationship between them
so i will go off and learn git and stop wasting people's precious time
More information about the mythtv-dev