On Wed, 25 May 2016, Mark Adams wrote: > > > > > >> 10:09 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git > > reset --hard f2cb8422898d35ef96e146caa3a95b2f879b25f1 > > HEAD is now at f2cb842 fixed bug in makefile > > > > OK, now what? > > > > > > I guess there is not much choice. Pushed. > > 10:16 1 mark/snes-ex56c<> ~/Codes/petsc/src/snes/examples/tutorials$ git > pull origin mark/snes-ex56c > From bitbucket.org:petsc/petsc > * branch mark/snes-ex56c -> FETCH_HEAD > Merge made by the 'recursive' strategy.
If you did this - there is a fundamental misunderstanding of 'rebase' functionality You should have done 'git push -f' You can repeat again.. git reset --hard f2cb8422898d35ef96e146caa3a95b2f879b25f1 [verify as indicated in my previous e-mail] git push -f Satish > 10:16 mark/snes-ex56c> ~/Codes/petsc/src/snes/examples/tutorials$ git push > origin mark/snes-ex56c > Counting objects: 1, done. > Writing objects: 100% (1/1), 259 bytes | 0 bytes/s, done. > Total 1 (delta 0), reused 0 (delta 0) > remote: > remote: View pull request for mark/snes-ex56c => master: > remote: https://bitbucket.org/petsc/petsc/pull-requests/479?t=1 > remote: > To [email protected]:petsc/petsc.git > 1e2c4b3..69a0889 mark/snes-ex56c -> mark/snes-ex56c >
