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

O

okuznetsov12018-03-20 15:35:36

git

okuznetsov1, 2018-03-20 15:35:36

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"

Reply

Answer the question

In order to leave comments, you need to log in

0 answer(s)

Similar questions

V

Victor Incognito2021-05-01 16:22:15

How to use git + gitea to work with a project from self-contained sub-projects? 1Reply

R

Romi2021-05-03 10:52:20

If I made several commits to the wrong branch in a hurry, is it possible to somehow selectively transfer them to another? 2Reply

M

m4tkv2019-11-07 12:39:59

How to push changes from git to server? 1Reply

V

volucris12021-05-05 18:17:59

How to change files in webstorm depending on Git branch? 1Reply

A

Alexander N++2017-06-09 13:28:17

How to clear the commit history with a new pull request? 1Reply

Didn't find what you were looking for?

Ask your question