Nothing was lost. When next has been reset to master there has probably been something messy going on and you do not want to merge :)
I think the best thing to do is to check: Do I have anything in next that origin/master does not? git fetch git log origin/master..next --no-merges make a note of those changes, then discard you local next git checkout next git reset --hard origin/next and repeat your own local merges into local next before pushing. There's no need for an additional reset then. Martin On 5 April 2014 23:04, Johan Hake <[email protected]> wrote: > Hello! > > After pulling ffc/next into my outdated local next I encountered several > merge conflicts. It seemed that next has been reset to master. > > I was not able to resolve the merge and to get something that did not fail > on the buildbot, so I reset next with master. If there were any branches > merged with next for testing, which have not been merged with master they > need to be re-pushed to next. > > Johan > > _______________________________________________ > fenics mailing list > [email protected] > http://fenicsproject.org/mailman/listinfo/fenics > >
_______________________________________________ fenics mailing list [email protected] http://fenicsproject.org/mailman/listinfo/fenics
