M
M
mishapsv2017-08-04 10:51:42
git
mishapsv, 2017-08-04 10:51:42

Why are my code changes being overwritten when merge?

There is branch 1 on the remote repository from which I created mine 1-2 locally.
After working with branch 1-2 (locally), I switched to 1 (locally), made a pull from the remote.
Switched back to 1-2 (locally) and did a git merge 1
As a result, most of my work was overwritten by the old code from branch 1 (no one worked on that block).
Maybe you have come across this?

Answer the question

In order to leave comments, you need to log in

2 answer(s)
R
Roman Mirilaczvili, 2017-08-04
@2ord

Most likely, the code was overwritten when the conflict was resolved by those who resolved it.

L
lgXenos, 2017-08-04
@lgXenos

we had when one person had 2 repositories connected,
he always considered the second code important. as a result, we ruled the same variable for a month
+ anyone can merge without commit or force-merge

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question