Categories

JavaScriptPHPHTMLCssPythonWordPressWeb developmentLinuxMySQLAndroidWindowsJavaC++ / C#LayoutReactUbuntuYiiDjangoProgramming1C-BitrixLaravelSystem administrationTelegramJSONDebianPostgreSQLIOSGoogleHtaccessWindows ServerGitMacOSGoogle ChromeCMSWooСommerceBootstrapNginxSQLUnityAPI
Make a leaderReport
O
O
okuznetsov12017-05-31 10:45:42
git
okuznetsov1, 2017-05-31 10:45:42

Is it possible and how to remove question marks when resolving conflicts in tortoisGitMerge ("edit conflict") in the lower "merge" window?

Screenshot for a complete understanding of the problem - pixs.ru/showimage/3jpg_5147240_26365035.jpg

Reply
Answer the question

Answer the question

In order to leave comments, you need to log in

1 answer(s)
Report
S
Sergey, 2017-05-31
@okuznetsov1

To do this, you need to resolve this conflict

Similar questions
A
alexandrnevajno12018-01-28 11:57:28
Git - please explain why you came up with add? Why it was impossible to do immediately commit (Without add)? 6Reply
S
Sergey2015-09-22 15:00:48
What is your process for developing a site (opencart) using git? How do you sync a db in git? What do you close in .gitignore for opencart? 2Reply
S
Stanislav2015-09-22 15:07:13
How to change the folder address of a repository and its working folder in git? 1Reply
N
NikitaG2010-12-28 16:26:53
GIT: How to count the contribution of each developer? 7Reply
L
littleguga2015-09-25 14:15:56
Why github and not gitlab? 5Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question