Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
TortoiseGit
TortoiseGit
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 302
    • Issues 302
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
    • Iterations
  • Merge requests 9
    • Merge requests 9
  • 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
  • #1756

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

Rebase trips over merge commits

By yplvi... on April 24, 2013 12:15 (imported from Google Code)


What steps will reproduce the problem?

  1. Create branch A from master
  2. Create several commits in A, one of them being a merge commit (commit with 2 parents)
  3. Rebase A with master

What is the expected output? What do you see instead?
Expected: rebase proceeds normally.
Actual: rebase stops when it encounters a merge commit. Only the Abort button is active.
Printout:

Pick 15: eed42187801482c493cd63d9cfbf52b7b3076cb3
error: Commit eed42187801482c493cd63d9cfbf52b7b3076cb3 is a merge but no -m option was given.
fatal: cherry-pick failed
An unrecoverable error occurred.

What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 1.8.2.0
git version 1.7.7.GIT (C:\Program Files\msysgit\msysgit\bin)

Please provide any additional information below.
When rebase is performed using the CLI (git rebase), everything is fine.

Thanks.

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