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

TortoiseGit "Abort merge" should work like "git merge --abort"

By hannes.gaen... on February 20, 2015 09:57 (imported from Google Code)


What steps will reproduce the problem?

  1. Makes changes to files (for merge conflict), commit
  2. Make an additional change to an existing file testfile, which will not lead to a conflict, do NOT commit
  3. Pull -> Create a merge conflict (conflicts for files in #1 (closed))

What is the expected output? What do you see instead?
- If I choose "TortoiseGIT Abort merge" | HARD, then changes in testfile will be thrown away, because a HARD RESET is done
- If I execute "git merge --abort" instead, then changes in testfile will NOT be thrown away...

Easy solution:
-> If git Version is >= 1.7.4, just call "git merge --abort"
-> If git Version is >= 1.6.1, just call "git reset --merge"

What version of TortoiseGit and msysgit are you using? On
what operating system?
- TortoiseGIT 1.8.13
- GIT 1.9.5

Please provide any additional information below.
http://stackoverflow.com/questions/101752/i-ran-into-a-merge-conflict-how-can-i-abort-the-merge

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