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

4

4sadly2020-02-05 23:34:44

How to determine when and which user entered the channel? 4Reply

R

Rufix2019-09-15 16:15:49

How/where to learn git? 1Reply

P

Pervachok2017-04-19 11:25:12

How to pull the contents of a specific branch in git? 3Reply

F

fapchat2019-09-20 19:03:56

How to clone a repository from github to a folder? 0Reply

M

my_webblog2019-09-20 20:34:59

The repository in gerrit (on the web) disappeared, is it visible in the console? 0Reply

Didn't find what you were looking for?

Ask your question

Ask a Question

731 491 924 answers to any question