[dokuwiki-teams] Re: Git expert?
- From: Anika Henke <anika@xxxxxxxxxxxxxxx>
- To: dokuwiki-teams@xxxxxxxxxxxxx
- Date: Mon, 18 Apr 2011 22:00:31 +0100
On 18/04/2011 21:47, Guy Brand wrote:
https://github.com/splitbrain/dokuwiki/commit/f493983cbddc6c8c387a76bf3f6631853485162b
strange commit which got in from a merge I did from akate's request. Her
patches seemed ok, the changes where ok, instructions of github for the
merge were the same as usual. If anyone can explain this huge thing...
Something like this is quite normal when the merged branch was too far
behind the master branch. Apart from the other commits akate did, these
'merge commits' are done automatically by git. In this specially case I
guess many of our changes over the weekend were missing from here
repository and git automatically merged and committed them ("again")
after akate committed her stuff.
It's hard to explain, git can get quite complex... Google for "git merge
branch" and you'll find more exhaustive explanations.
Anika
Other related posts:
