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

S

S

Sergey2016-01-25 16:02:15

git

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

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

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

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?

Similar questions

H

hrvasiliy2015-08-15 06:29:07

How to fix cloning error? 1Reply

I

Igor Bezlepkin2019-12-20 14:01:28

What is the correct way to organize two projects in one git project? 1Reply

A

Alexis178422015-08-17 14:18:43

The git log command prints only part of the commit comment on the command line. How can I set up full display? 1Reply

M

mr-zherart2017-07-25 16:12:26

Why does Git overwrite changes without creating conflicts? 0Reply

C

Chvalov2017-07-27 19:13:40

Where to buy cheap Storage VPS for cloud storage of files and repositories? 4Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question