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
B
Berti2016-08-05 12:43:57
What is the problem when committing in GIT: Use your own repository for commit? 1Reply
A
Alexey Yarkov2016-08-06 23:03:48
How to add a folder from the master branch to gh-pages? 1Reply
O
Outsider V.2019-01-09 18:35:09
How to add an existing local folder as a Git submodule? 1Reply
A
alex1nd2016-08-09 15:46:22
How to use git/github on two systems at once? 1Reply
Y
Yuri Pikhtarev2014-07-22 17:50:27
How to export a repository from SVN to GIT with readable history? 1Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question