P
P
pontiac3582016-02-19 20:13:46
git
pontiac358, 2016-02-19 20:13:46

How to forcibly sever branches?

There are two branches (branch1, branch2), I want to merge them, but git shows a lot of conflicts, how to make it just erase them without paying attention to conflicts. In other words, I need to make sure that all the data from branch1 gets into branch2 and they become the same.

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
aol-nnov, 2016-02-19
@aol-nnov

git checkout branch1
git reset --hard branch2
but what's the point? You can just delete branch1 and recreate from branch2, right?
and how to send all this goodness to origin has already been suggested - you need to use force :)

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question