Answer the question
In order to leave comments, you need to log in
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
Most likely, the code was overwritten when the conflict was resolved by those who resolved it.
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question