Hello I have been working on a project and I realized somewhere I introduced a bug. I found the closest save point to where i was, i believe it was HEAD -2, and checked it out. I then laid in several commits, and now i cant push here is a view of my history, and the commands i executed to get into this state HISTORY (time flows up) * 1bc1ffb current state * 735d64f * 07dd73d Project working again * c70627c * 4c6a8ea * 2828db4 * c38ef0b | * 1815aac | | * fe6e0ac Version bump | | * 32de1e5 BROKE | | * 528cb37 Bug introduced? | |/ | * ef4ff7e |/ | * ef4ff7e |/ * 8238b14 GOOD . . . COMMANDS (time flows down) PUSH 8238b14 GOOD PUSH ef4ff7e PUSH 528cb37 Bug introduced? PUSH 32de1e5 BROKE PUSH fe6e0ac BROKE Version bump CHECKOUT master -> ef4ff7e CHECKOUT ef4ff7e -> dev COMMIT 1815aac CHECKOUT dev -> 8238b14 COMMIT c38ef0b COMMIT 2828db4 COMMIT 4cba8e9 COMMIT c70627c COMMIT 07dd73d Project OK again CHECKOUT 07dd73d -> mvp1 CHECKOUT mvp1 -> master COMMIT 735d64f COMMIT 1bc1ffb current state now when i try to push: user@host:~/workspace/project$ git push To git@xxxxxxxxxx:xxxxxxxxxxxxx.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'git@xxxxxxxxxx:xxxxxxxxxxxxxxxxxxx.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. user@host:~/workspace/project$ git status # On branch master # Your branch and 'origin/master' have diverged, # and have 7 and 4 different commit(s) each, respectively. # nothing to commit (working directory clean) user@host:~/workspace/project$ git branch dev * master mvp1 noopt temp Any help would be great. Thanks Mike -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html