On Wed, Nov 13, 2013 at 10:25 AM, Kornel Benko <[email protected]> wrote:
> Am Mittwoch, 13. November 2013 um 10:02:30, schrieb Kornel Benko < > [email protected]> > > Am Dienstag, 12. November 2013 um 22:21:48, schrieb Tommaso Cucinotta < > [email protected]> > > > Kornel, > > > > > > I'm just thinking of dropping entirely features/chat, and > > > continuing on features/chat2. > > > > No problem. I have only sk.po changed here. > > > > > Not sure about what happened with features/chat, but from > > > the web view I can only say it seems a critical and unrecoverable > > > spaghetti situation :D -- I have no clue of how I could do it! > > > > > > On the other hand, features/chat2 seems OK and I recently added > > > a couple of clean-up patches that also fix whitespaces compliance > > > with LyX coding style (you want to checkout this branch, before > > > any further edits, to prevent conflicts). > > > > I will. > > Got problems with chat2 (by 'git checkout features/chat2'). > > ... > From git.lyx.org:developers/tommaso/lyx > + 17db3df...8da0eea features/chat2 -> origin/features/chat2 (forced > update) > 8f77d19..4963f71 features/chat -> origin/features/chat > 6f488a9..be46813 master -> origin/master > Auto-merging src/frontends/qt4/ui/BuddiesUi.ui > CONFLICT (add/add): Merge conflict in src/frontends/qt4/ui/BuddiesUi.ui > 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 > Automatic merge failed; fix conflicts and then commit the result. > > Deleting branch features/chat does not help > > I then restarted with completely new checkout, takes ages, but was > successful. > > 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
