Categories

JavaScriptPHPHTMLCssPythonWordPressWeb developmentLinuxMySQLAndroidWindowsJavaC++ / C#LayoutReactUbuntuYiiDjangoProgramming1C-BitrixLaravelSystem administrationTelegramJSONDebianPostgreSQLIOSGoogleHtaccessWindows ServerGitMacOSGoogle ChromeCMSWooСommerceBootstrapNginxSQLUnityAPI
Make a leaderReport
Y
Y
ya_hooeu2017-05-23 12:38:03
git
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?

Reply
Answer the question

Answer the question

In order to leave comments, you need to log in

2 answer(s)
Report
S
sim3x, 2017-05-23
@sim3x

https://www.google.com.ua/search?q=Push+to+origin3...

Report
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
A
Alexey2015-05-21 13:20:09
How to clone a GitHub repo if the account has two-factor authentication? 2Reply
D
Daniil Kochkin2019-10-13 08:14:46
How to add a file to a folder on GitHub? 0Reply
@
@Twitt2019-10-13 12:31:28
If there has ever been data in a repository that you don't want to show to anyone, will it go down in history? 1Reply
C
Crash2015-05-28 14:23:01
How to change the authorization protocol for an already cloned git repository? 1Reply
R
Roman2019-10-14 09:39:28
How do I make the current (master) local branch a spare branch, go back a few commits (to commit-23) and start a new master from there? 1Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question