Categories

JavaScriptPHPHTMLCssPythonWordPressWeb developmentLinuxMySQLAndroidWindowsJavaC++ / C#LayoutReactUbuntuYiiDjangoProgramming1C-BitrixLaravelSystem administrationTelegramJSONDebianPostgreSQLIOSGoogleHtaccessWindows ServerGitMacOSGoogle ChromeCMSWooСommerceBootstrapNginxSQLUnityAPI
Make a leaderReport
I
I
Ilya2016-12-14 10:49:32
git
Ilya, 2016-12-14 10:49:32

I can’t resolve the conflict during the merge, what could be the error?

When resolving a conflict during a merge, when we change conflicting files, it shows the error Looks like someone pushed while you were working. What could it be and how to solve it?

Reply
Answer the question

Answer the question

In order to leave comments, you need to log in

1 answer(s)
Report
A
Alexander Sharihin, 2016-12-14
@Pinsky

The error message says that you need to pool first, then push your own.

Similar questions
O
ODY2014-05-15 17:39:50
How to synchronize development on 2 computers using git? 3Reply
S
sitev_ru2016-06-22 16:53:39
How to see non-own updates on github? 1Reply
A
Andrey2016-06-24 14:31:33
How to disable fast-forward in a repository? 1Reply
N
NoorBall2014-05-22 06:40:03
Does the GNU GPL v2 that Git comes under allow you to create and use your own version control system in your organization? 1Reply
O
Ole892018-11-27 12:11:36
Why does Git add a backend but not a frontend? 1Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question