Skip to content
GitLab
Closed
Issue created by NaCl@zsynacl

Show progress bar when resolving lots of conflicts

What steps will reproduce the problem?

  1. many conflicts occurs.
  2. use TortoiseGit "resolve conflict"
  3. "Use HEAD solve conflict" or other, apply it on all files

What is the expected output? What do you see instead?

REALLY want to know the status of this procedure. Now I can only see the main window with a "not responding" title.

Can I have a process bar to know how many files has been processed?

What version of TortoiseGit and Git are you using? On what operating system?

  • TortoiseGit 2.6.0.0
  • git for windows 2.14.1
Edited by Sven Strickroth
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information