Categories

JavaScriptPHPHTMLCssPythonWordPressWeb developmentLinuxMySQLAndroidWindowsJavaC++ / C#LayoutReactUbuntuYiiDjangoProgramming1C-BitrixLaravelSystem administrationTelegramJSONDebianPostgreSQLIOSGoogleHtaccessWindows ServerGitMacOSGoogle ChromeCMSWooСommerceBootstrapNginxSQLUnityAPI
Make a leaderReport
S
S
s2018-03-25 17:24:31
git
s, 2018-03-25 17:24:31

How to bring the file back to normal?

After merging several branches with method implementations, I finally got the following file:
5ab7b048da94a873032865.png
How to bring the file to a normal working form?

Reply
Answer the question

Answer the question

In order to leave comments, you need to log in

1 answer(s)
Report
A
Alexey Yarkov, 2018-03-25
@solovladys

https://githowto.com/en/resolving_conflicts

Similar questions
R
Roman2019-02-26 08:03:38
How to properly set up Git for Laravel? 2Reply
Y
yellow_pus2022-04-19 00:41:07
How to disable "association" with a project in github/bitbucket? 1Reply
A
Artemy Antipin2016-10-06 07:32:17
I'm trying to deal with the topic: changes on the local server and how to upload this data to the combat site? 1Reply
B
BonBon Slick2016-10-06 16:49:27
How did Git break? 1Reply
V
Victoria Kabishova2020-11-30 06:26:43
How to call git from developer console in visual studio? 1Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question