How to merge a branch so it doesn't delete a method in master?

S

Sergey2016-01-25 16:02:15

git

Sergey, 2016-01-25 16:02:15

There are 2 branches: master and order. Master has an adds method, order doesn't. When I merge order into master, the method disappears. How to merge so that in case of a non-conflict merge of the file, the method does not disappear?

Reply

Answer the question

In order to leave comments, you need to log in

2 answer(s)

A

Alexey Romanenko, 2016-01-25
@slimus

To order, merge master, and then vice versa

A

Andrey, 2016-01-25
@VladimirAndreev

in the order method was removed?