[dokuwiki-teams] Re: Git expert?
- From: Anika Henke <anika@xxxxxxxxxxxxxxx>
- To: dokuwiki-teams@xxxxxxxxxxxxx
- Date: Tue, 19 Apr 2011 00:01:14 +0100
On 18/04/2011 22:39, Guy Brand wrote:
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
A pull is a fetch and a merge. So when she pulled, she merged as well
(which is the way it's supposed to be).
There are two ways to "solve" this problem:
a) pull before you commit
b) git pull --rebase
Anika
Other related posts:
