Answer the question
In order to leave comments, you need to log in
Y
Y
ya_hooeu2017-05-23 12:38:03
ya_hooeu, 2017-05-23 12:38:03
PhpStorm How to push - non-push?
Push to origin3/master was rejected - what they eat and how to fight)
I pushed something, then someone on the git also pushed something.
As a result, we each have a file that we both changed.
How to resolve the conflict? Where to push?
2 answer(s)
@gogolor
A
Alexander Manakov, 2017-05-23 @gogolor
You must either merge or rebase. zhmak Read
, choose what suits you more (merge is easier and more understandable, rebase is more correct) and look for this function in your IDE
Similar questions
P
A
Q
A
D
Didn't find what you were looking for?
Ask your questionAsk a Question
731 491 924 answers to any question