I just squashed some commits with git rebase and did a git push --force (which is evil, I know).

Now the other software engineers have a different history and when they do a git pull, Git will merge. Is there a way to fix this, except doing a rm my-repo; git clone git@example.org:my-repo.git?

I need something like the opposite of git push --force, but git pull --force did not give the intended results.

5 Answers
5

Tags:

Leave a Reply

Your email address will not be published. Required fields are marked *