Missing text in dialog
What steps will reproduce the problem?
- Push a change from a repo not up-do-date
- When prompted (very nicely) by TortoiseGit, pull new changes from other end
- Push again
What is the expected output? What do you see instead?
I see what is apparently half of a sentence. I have no idea what the other half is.
This is what I see (roughly, as the dialog does not seem to permit copy & paste, so this is a freehand representation):
While merging conflicts can occur which need to be resolved manually (i..e, integrate your changes into a file which was also modified on another branch).
I can tell from the "While" that this was an introduction to something, but the second part got lost, apparently.
What version of TortoiseGit and Git are you using? On what operating system?
TortoiseGit 220.127.116.11 (C:\Program Files\TortoiseGit\bin) git version 2.9.0.windows.1 (C:\Program Files\Git\bin; C:\Program Files\Git\mingw64; C:\Program Files\Git\mingw64\etc\gitconfig; C:\ProgramData\Git\config)
Please provide any additional information below.