[dokuwiki-teams] Re: Git expert?
- From: Guy Brand <gb@xxxxxxxxxx>
- To: dokuwiki-teams@xxxxxxxxxxxxx
- Date: Mon, 18 Apr 2011 23:39:05 +0200
On Apr 18, 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...
I know what happened: akate has a clone of the repo, but she merged her
clone with the remote master instead of pulling from it to update it
(maybe a wrong order in the merge command). When I pulled her changes
to get the ukrainian lang updates, I could not see this merge commit
diffing against master (all changes it contains are already in my up
to date clone of master). After the merge of her lang update commits,
the other big merge commit appears in the history as a parent, but the
repo is not polluted (except if you decide to checkout her particular
merge commit :-)) and nothing more but the update ukrainian lang files
have been added.
git log --stat if you need to see added/removed files/lines.
--
bug
Other related posts:
