On 28 October 2010 02:07, Adam Jimerson <[email protected]> wrote: > I know this is more about general Git and not about GitHub, but if > someone here can help me out I would be grateful. One of my Repo collab > pushed a commit into the wrong place in my repo. I need a way to roll > that branch back or push my local copy of the branch (some how avoiding > the "non-fast forward" error). I don't know if this is what the rebase > feature of git is for or not.
Git is complaining about 'non-fast forward' because you're rewriting history -- in this case, you're completely removing a commit from the history of your branch on the server. It does this because it's possible to lose data by rewriting history. But if that's definitely what you want to do, then go ahead and force Git to do it, by passing -f to git push. Chris -- You received this message because you are subscribed to the Google Groups "GitHub" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/github?hl=en.
