0

I have just done 

git pull upstream master -f

and my repo is still 13 commits ahead opencv:master.

I have read this post and this one but unfortunately it does not help me. If i press compare in github interface I can see this 13 commits. How can I have repo even with opencv:master. ?

Thanks for yours answers

Community
  • 1
  • 1
LBerger
  • 593
  • 2
  • 12
  • 2
    Well your branch **is** [ahead of 13 commits](https://github.com/opencv/opencv_contrib/compare/master...LaurentBerger:master). All 13 are commits done by you in your fork and not submitted to the upstream repo. Submit a pull request if you want upstream to have your changes. – Martin Aug 08 '16 at 17:36
  • Thanks for your comment. Does it mean a git reset HEAD ~13 and a new git pull upstream will solve my problem – LBerger Aug 08 '16 at 17:59
  • I try :git reset --hard upstream/master result is HEAD is now at dd9b2eb Merge pull request #710 from VladX:optflow and after git push : ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'https://github.com/LaurentBerger/opencv_contrib' hint: Updates were rejected because the tip of your current branch is behind – LBerger Aug 08 '16 at 18:09

0 Answers0