Git merge or rebase?

Question

I have a project in which my master branch is ahead of backup branch. Due to some issues in code we want to use the backup branch as our gold copy and overwrite the same on master. Any suggestion what should be the better approach in this case? Merge or rebase? Also please provide the command to make things more simpler.

PS: It's ok to lose the current changes in master. Infact we have branch out of master as our reference

Martin G · Accepted Answer · 2016-10-27 02:33:35Z

2

You should reset the master to point to the tip of the backup. Not do a merge or rebase.

git checkout master
git reset --hard backup
git push origin

Alternatively, you can revert everything that has happened after the backup commit.

answered Oct 27, 2016 at 2:33

Martin G

18.4k12 gold badges91 silver badges105 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Git merge or rebase?

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related