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 381
    • Issues 381
    • 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
  • #2676
Closed
Open
Issue created Dec 28, 2015 by Jiří Engelthaler@engyczContributor

Swapped Theirs and Mine in Edit conflicts outside of rebase dialog on rebasing

What steps will reproduce the problem?

See attached file with repository and two cloned directories

  1. worktree_pull - do Sync-Pull. There will be conflicts. Edit conflict. Theirs and Mine are correct.

  2. worktree_pull_autorebase - master branch has rebase = true in .git/config. Do Sync-Pull. There will be conflicts. Edit conflict. Theirs and Mine are swapped. Mine is theirs and Theirs is mine.

I don't know if this is a bug in TortoiseGit or in git itself.

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

TGit 1.8.16.0

git 2.6.4.windows.1

Please provide any additional information below.

conflist_swap.zip

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