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

Preventing users from inadvertendly unchecking files during a commit/conflict merge

By alex.nola... on August 26, 2014 23:05 (imported from Google Code)


What steps will reproduce the problem?

On any workflow

  1. Produce a conflict
  2. Resolve the conflict
  3. Commit merge

What is the expected output?
It would be helpful especially for beginners if the list presented during the commit merge conflict is read only and allow editing only through a checkbox.
(please see screenshot)

What do you see instead?
Right now users are presented with their changes along with others that are part of the commit merge. From years of experience, this causes users to start unchecking other files causing other changes to get lost. If you could prevent this with the UI, it would be great.

What version of TortoiseGit and msysgit are you using?
1.8

On what operating system?
Windows

Please provide any additional information below.

This is an enhance request which could be helpful to newcomers and it could reduce the number of "bad commit" merges which can lead to hard to troubleshoot bugs.

Please do consider.


CommitMerges.png

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