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

D

Dimmduh2016-08-22 13:58:14

Which management system version is suitable for binary files? 4Reply

A

Artyom Pinul2016-08-24 09:59:45

How to install Git on Centos 7, to a different address and port (other than what comes by default)? 0Reply

D

DEMonBond2020-11-02 19:29:21

How to properly organize the storage structure and version control of the project? 1Reply

F

friktor2014-08-12 09:41:00

How to add an accompanying user to a private github repository? 2Reply

R

Roman Koff2022-03-17 15:23:07

How to properly organize a github repository for a solution? 0Reply

Didn't find what you were looking for?

Ask your question