Skip to main content

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

11
  • 6
    Note that this can also happen for branches previously visited locally, which have had commits in the upstream repository. Is there an easy way to just fast forward such an old branch or simply let git forget about it in the local repository?
    – Thorbjørn Ravn Andersen
    Commented Feb 19, 2013 at 9:27
  • 53
    @ThorbjørnRavnAndersen - I managed to fix this scenario using 'git push -f' which seemed to make git forget about its imaginary problems :)
    – Echelon
    Commented May 28, 2013 at 14:37
  • 8
    Seen a complain about this from git newcomer. The reason is that when they create a new project on GitHub, they leave tickbox "Initialise with readme" or choose .gitignore/GPL options, so new project already has a commit they do not have locally, thus the confusion caused by error above.
    – Ruslan Kabalin
    Commented Oct 14, 2013 at 14:30
  • 5
    @Echelon the -f option to force the push is dangerous. I just used it in a team project and 6 commits were "striped", simply deleted from server and no way to get them back!
    – Deleplace
    Commented Jan 14, 2014 at 10:47
  • 45
    Its trendy to praise git. But almost every developer I talked to, privately agree that they personally hate git. Now that they use git they spend so much more time in source control compared to what they used to spend when they used perforce or TFS.
    – developer747
    Commented Mar 5, 2015 at 16:26