Answer by Paul John Leonard for Making two branches identical
All other answers seemed either a bit complex or did not have quite the correct syntax for me. To make A the same as the current B: git checkout A git reset origin/B --hard git push --force
View ArticleAnswer by ABHISHEK T S for Making two branches identical
git merge A is the best way to make 2 branches identical if the head is in branch b
View ArticleAnswer by Kellen Stuart for Making two branches identical
The answers in this post are way too complicated for my taste.Here's what I did:Assuming you're on the branch you want to changeStep 1 - Make the branch the same as mastergit reset origin/master...
View ArticleAnswer by Pero122 for Making two branches identical
Here is a last resort idea (it's dirty and not a git way of doing things)...Go to branch B (git checkout B).Copy all the content of that branch(ctrl + c)Go to branch A (git checkout A)Delete everything...
View ArticleAnswer by Sergey Sahakyan for Making two branches identical
here is the nice way I am using to do this for me.The idea is to get diff of A and B, commit that diff, revert that to create opposite commit and than cherry-pick that last revert commit to Ahere are...
View ArticleAnswer by torek for Making two branches identical
There are a lot of ways to do this and which one you should use depends on what result you want, and particular what you and anyone collaborating with you (if this is a shared repository) expect to see...
View ArticleAnswer by Pianov for Making two branches identical
Checkout your target branch:git checkout A;To remove everything in branch A and make it to be the same as B:git reset B --hard;If you need to discard all your local changes (kind of revert, but doesn't...
View ArticleAnswer by AlexZam for Making two branches identical
You need to git reset branch A to branch B.See docs.
View ArticleMaking two branches identical
I have two branches - A and B. B was created from A.Work on both branches continued in parallel. Work on branch A was bad (resulting in a non-working version) while work on branch B was good. During...
View ArticleAnswer by Josh Ventura for Making two branches identical
I was struggling with this because I didn't realize a soft reset also immediately and permanently altered local branch state—creating a branch if it doesn't already exist! So when I checked out a tag...
View Article