Did you reset your local empty-length branch to 85e391e43 ? (That's your last commit before hell broke loose)
Vincent On Fri, May 24, 2013 at 3:18 PM, Jean-Marc Lasgouttes <lasgout...@lyx.org>wrote: > Le 24/05/13 12:20, Vincent van Ravesteijn a écrit : > > I've reset the branch now to the last commit you made. All commits from >> master were somehow rebased or cherry-picked on top of the feature branch. >> >> You can merge it into master by: >> >> git checkout master >> git merge empty-length -m "Please supply a commit message instead of >> the default" >> > > I get lots of errors like: > > Auto-merging src/tests/test_layout > CONFLICT (add/add): Merge conflict in src/tests/test_layout > Auto-merging src/insets/InsetBox.cpp > Auto-merging src/frontends/qt4/qt_helpers.h > Auto-merging src/frontends/qt4/qt_helpers.**cpp > Auto-merging src/TextClass.cpp > CONFLICT (content): Merge conflict in src/TextClass.cpp > > These should not happen. > > JMarc >
