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 380
    • Issues 380
    • 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
  • #3307
Closed
Open
Issue created Nov 30, 2018 by Scott Barnes@scott.barnes

Abort Merge on a single file always results in a parameter error message

What steps will reproduce the problem?

  1. Begin a merge which results in conflicts.
  2. Resolve conflicts on one of the files.
  3. On the same file, select TortoiseGit-->Abort Merge

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

The selected file should be returned to its post-merge, conflicted state. Instead, an error dialog appears: "The parameters '/path' and '/pathfile' are mutually exclusive. You must only specify one of them."

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

Duplicated in two environments:

  • TortoiseGit 2.7.0.0, git version 2.18.0.windows.1, Windows 7 Pro SP1 64-bit
  • TortoiseGit 2.7.1.0 (20181021-7f2d0004), git version 2.17.0.windows.1, Windows 10 Enterprise Version 1803 64-bit

Please provide any additional information below.

The same error message will occur regardless of whether changes or conflicts occurred on the file.

Edited Nov 30, 2018 by Sven Strickroth
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking