O
O
okuznetsov12018-03-20 15:35:36
git
okuznetsov1, 2018-03-20 15:35:36

Why does git merge delete duplicate lines when resolving a conflict when it shouldn't?

Pay attention to the 13th line in the left panel, and to the 14th in the right.
In the left panel, the "develop" (new) branch, in the right "feature/restapi". "feature/restapi" is merged with "develop"
hc5-mlel3um6jkmhzm2q0nnbuim.jpeg

Answer the question

In order to leave comments, you need to log in

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question