2012/4/29 Vincent van Ravesteijn: > You can't undo this. > > You had local commits on master, and then you fetched the new commits from > the server. Now there are two ways of merging the local changes and the > changes from the server. Either you do a regular merge, or you can rebase > your local changes on top of the changes from the server. You should do the > latter: 'git rebase origin/master'.
Thanks. Jürgen > Vincent >
