Find centralized, trusted content and collaborate around the technologies you use most.
Learn more about CollectivesStack Internal
Knowledge at work
Bring the best of human thought and AI automation together at your work.
Explore Stack InternalYou can squash her branch to prevent Successive conflict resolving. when you squash all commit in her branch after creating from master into one commit, then conflict can be resolve in one step.
If you want to write the new commit message from scratch, this suffices:
git reset --soft HEAD~3 && git commit In this example, we'll squash the last 3 commits.
To prevent this problem in the future, I recommend you to rebase your branch with source branch after each commit.
You can squash her branch to prevent Successive conflict resolving. when you squash all commit in her branch after creating from master into one commit, then conflict can be resolve in one step.
If you want to write the new commit message from scratch, this suffices:
git reset --soft HEAD~3 && git commit To prevent this problem in the future, I recommend you to rebase your branch with source branch after each commit.
You can squash her branch to prevent Successive conflict resolving. when you squash all commit in her branch after creating from master into one commit, then conflict can be resolve in one step.
If you want to write the new commit message from scratch, this suffices:
git reset --soft HEAD~3 && git commit In this example, we'll squash the last 3 commits.
To prevent this problem in the future, I recommend you to rebase your branch with source branch after each commit.
You can squash her branch to prevent Successive conflict resolving. when you squash all commit in her branch after creating from master into one commit, then conflict can be resolve in one step.
If you want to write the new commit message from scratch, this suffices:
git reset --soft HEAD~3 && git commit To prevent this problem in the future, I recommend you to rebase your branch with source branch after each commit.