Had to revert a commit but now need to push it back to remote repo

Question

I had to revert to a previous commit by running:

 git revert <HASH>

So I go push the changes back into my remote repo and it failed with:

 ! [rejected]        ci_172 -> ci_172 (non-fast-forward)
 To prevent you from losing history, non-fast-forward updates were rejected
 Merge the remote changes before pushing again.

oh, gotta merge? sorry im new to Git and version control in general — sdot257, Mar 03 '10 at 22:15

score 0 · Answer 1 · answered Mar 03 '10 at 23:16

0

You need made a pull before

git pull origin
git push origin

The pull made a fetch and merge from origin. After this merge you can push your commit

answered Mar 03 '10 at 23:16

shingara

46,608
11
99
105

score 0 · Accepted Answer · edited May 23 '17 at 12:18

0

You are going to need to force the push with git push [remote-path] +[branch]. So, if I was pushing master to origin, that would look like git push origin +master.

You can see more at How can I remove a commit on github?.

edited May 23 '17 at 12:18

Community

1
1

answered Mar 04 '10 at 03:48

Benjamin Manns

9,028
4
37
48

Had to revert a commit but now need to push it back to remote repo

2 Answers2