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
  • #718
Closed
Open
Issue created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

When pulling it should be possible to directly open the modifications window for editing conflicts

By Adriaa... on February 17, 2011 11:13 (imported from Google Code)


What steps will reproduce the problem?

  1. Make a situation where a pull will cause conflicts
  2. Do the pull -> the log shows that there are conflicts
  3. Now i need to browse through my files or click tortoisegit/check-for-modifications for solving the conflicts

Can the pull dialog show an extra button 'check for modifications' when there is a conflict after pulling? This will make the process of fixing conflicts more easy (and even more conform how toirtoiseSVN users do it, namely rightclick on each red line in the update-log)

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