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

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)

S

Sergey, 2017-05-31
@okuznetsov1

To do this, you need to resolve this conflict

Similar questions

M

martensit2016-09-03 00:48:58

What code should be written in GIT to create a difference file (patch) of two other files? 1Reply

T

Trafalgar2022-03-25 14:38:50

How to properly clone a private github repository? 2Reply

A

AlinaCat2019-02-06 04:16:36

Git bash terminal - does it make sense to use? 1Reply

T

TechNOIR2020-11-10 10:20:09

Git. What is the correct way to get changes from the master repository and apply them to the local one? 2Reply

J

JastaFly2022-03-28 13:36:45

Gitlab remote: HTTP Basic: Access denied? 1Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question