Answer by John Kugelman for Merge commit reverts multiple commits in target...
This is your starting situation. Your branch had commits C-J on top of B while your coworker's branch had K on top of B:+-> C --> D --> E --> F --> G --> H --> I --> J...
View ArticleMerge commit reverts multiple commits in target branch
I have been working on a branch with several commits, say A, B, C, D, E, F, G, H, I, J.A co-worker of mine was working on another branch which was spawned from my B commit.This week, he merged his...
View ArticleAnswer by TTT for Merge commit reverts multiple commits in target branch
It sounds like your co-worker messed up the merge. One easy way to confirm this is to just retry the merge yourself:git switch -c test-branch J # create a temporary branch at J to test the mergegit...
View Article
More Pages to Explore .....