Git repository is out of sync after rebase
Posted
by
Keyo
on Stack Overflow
See other posts from Stack Overflow
or by Keyo
Published on 2011-01-07T01:43:45Z
Indexed on
2011/01/07
1:53 UTC
Read the original article
Hit count: 511
git
|version-control
I have squashed 2 commits (A and B) into one new commit (C). The previous two commits (A and B) where removed.
I pushed these commits from my development repo to a central(bare) repository. The git-log
on both repos confirms that commits A and B have been removed. The problem is when I do a pull on a third repository which already had (A and B) it now has all three commits (A, B and C).
I would have thought the pull would synchronise these changes. Do I need to checkout A~1 and then merge in the new changes? This seems like a hassle, especially in a production environment.
© Stack Overflow or respective owner