Skip to content

GitLab Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
TortoiseGit
TortoiseGit
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 301
    • Issues 301
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 8
    • Merge requests 8
  • Requirements
    • Requirements
    • List
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
    • Test Cases
  • Analytics
    • Analytics
    • CI/CD
    • Code Review
    • Insights
    • Issue
    • Repository
    • Value Stream
  • Members
    • Members
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • TortoiseGit
  • TortoiseGitTortoiseGit
  • Issues
  • #964

Closed
Open
Created Aug 02, 2015 by Sven Strickroth@mrtuxOwner

Can't mark conflict as resolved

By sergey.iva...@enkigames.com on November 16, 2011 12:29 (imported from Google Code)


Repro steps:

  1. Pull data from different branch and became lot of conflicts (about 150)
  2. Edit conflict and try to mark it as resolved

In some cases this error occurs http://gyazo.com/7e13a1edfb3c76208b91cf6d4000861d

I'm using
TortoiseGit-1.7.5.0-64bit
Git-1.7.4-preview20110204
Win 7

Some conflicts are resolving fine and I can't understand what does it depend

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