Skip to content
GitLab
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • TortoiseGit TortoiseGit
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 382
    • Issues 382
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 16
    • Merge requests 16
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test cases
  • Deployments
    • Deployments
    • Releases
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGitTortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #2883
Closed
Open
Issue created Dec 06, 2016 by saracab@saracab

Missing text in dialog

What steps will reproduce the problem?

  1. Push a change from a repo not up-do-date
  2. When prompted (very nicely) by TortoiseGit, pull new changes from other end
  3. 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 2.3.0.0 (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.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking