Op 29-4-2012 12:08, Jürgen Spitzmüller schreef:
Author: Jürgen Spitzmüller<jspitzm@linux-np7j.(none)>
Date: Sun, 29 Apr 2012 11:51:07 +0200
New Commit: 8995a8387a03361b6a7ff44b447a90a6187b1a14
URL:
http://git.lyx.org/?p=lyx.git;a=commit;h=8995a8387a03361b6a7ff44b447a90a6187b1a14
Log:
Merge branch 'master' of git.lyx.org:lyx
Conflicts:
po/de.po
Signed-off-by: Jürgen Spitzmüller<jspitzm@linux-np7j.(none)>
How can I undo this? All I wanted to do is to resolve a conflict in /po :-/
Thanks
Jürgen (looking back to times where committing was not a science in itself)
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'.
Vincent
