A
A
andrei242017-05-22 11:57:26
git
andrei24, 2017-05-22 11:57:26

How to update master branch from develop with replacement?

There are 3 branches:
Mine, develop, master
When performing a task, I upload it to develop, everything is tested there. If there are no bugs, you need to upload all this to master with a complete replacement of all files from the master.
I used to do: merge dev with master, then pull with develop, fix conflicts and push.
Now: checkout master -> pull with squash from develop.
Merge conflicts keep popping up. I just need a complete replacement of master, develop with a branch

Answer the question

In order to leave comments, you need to log in

1 answer(s)
A
Andrey Burov, 2017-05-22
@BuriK666

delete the master branch and redo it.

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question