Am Mittwoch, 13. November 2013 um 10:31:53, schrieb Vincent van Ravesteijn <v...@lyx.org> > > > The errors will not be the result of a 'git checkout' command. It more > looks like a git pull. This is the reason, I don't advice to use git pull. > > If you would have done a 'git fetch', you will retrieve the new commits. > Then, you want to reset the features/chat2 branch to the new one tommasso > pushed: > > $ git checkout features/chat2 > $ git reset --hard <name_of_remote>/features/chat2 > > This must work without problems. > > Vincent
Sure Vincent. If one knows how.
For some days I was not looking at this branch.
I am really trying hard but:
#git reset --hard features/chat2
HEAD is now at 2993f12 whitespaces
#git fetch
#git status
# On branch features/chat2
# Your branch and 'origin/features/chat2' have diverged,
# and have 16 and 33 different commits each, respectively.
#
nothing to commit (working directory clean)
#git branch
* features/chat2
master
#git pull
Auto-merging src/frontends/qt4/GuiView.h
Auto-merging src/frontends/qt4/GuiView.cpp
Auto-merging src/frontends/qt4/GuiChatMessenger.cpp
CONFLICT (add/add): Merge conflict in
src/frontends/qt4/GuiChatMessenger.cpp
Auto-merging src/frontends/qt4/GuiChat.cpp
CONFLICT (add/add): Merge conflict in
src/frontends/qt4/GuiChat.cpp
Auto-merging src/frontends/qt4/GuiBuddies.h
CONFLICT (add/add): Merge conflict in
src/frontends/qt4/GuiBuddies.h
Auto-merging src/frontends/qt4/GuiBuddies.cpp
CONFLICT (add/add): Merge conflict in
src/frontends/qt4/GuiBuddies.cpp
Auto-merging configure.ac
Automatic merge failed; fix conflicts and then commit the
result.
Exit 1
#git status
# On branch features/chat2
# Your branch and 'origin/features/chat2' have diverged,
# and have 16 and 33 different commits each, respectively.
#
# Changes to be committed:
#
# modified: configure.ac
# modified: development/autotests/revertedTests
# modified: development/autotests/run-tests.sh
# modified: lib/layouts/paper.layout
# modified: src/Buffer.cpp
# modified: src/LaTeXFeatures.cpp
# modified: src/LyXAction.cpp
# modified: src/frontends/qt4/FileDialog.cpp
# modified: src/frontends/qt4/GuiHSpace.cpp
# modified: src/frontends/qt4/GuiVSpace.cpp
# modified: src/frontends/qt4/GuiView.cpp
# modified: src/frontends/qt4/GuiView.h
# modified: src/insets/InsetArgument.cpp
#
# Unmerged paths:
# (use "git add/rm <file>..." as appropriate to mark
resolution)
#
# both added: src/frontends/qt4/GuiBuddies.cpp
# both added: src/frontends/qt4/GuiBuddies.h
# both added: src/frontends/qt4/GuiChat.cpp
# both added:
src/frontends/qt4/GuiChatMessenger.cpp
#
What the mockery ... Nothing I try helps here. I for sure did not commit or
change anything.
Kornel
signature.asc
Description: This is a digitally signed message part.
