Skip to content
GitLab
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • heptapod heptapod
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 198
    • Issues 198
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 1
    • Merge requests 1
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • heptapodheptapod
  • heptapodheptapod
  • Issues
  • #43
Closed
Open
Issue created Jun 20, 2018 by Georges Racinet@gracinet🦑Owner

Unable to push a topic after rebase

I have pushed the following :

  • (3) [draft] [topic2] commit (parent 2)
  • (2) [draft] [topic1] commit (parent 1)
  • (1) [public] commit

Then because of #39 is a not yet available, I rebase my topic2 onto my public changeset so that the review can happen on topic2 without showing the changes of topic1 :

  • (4) [draft] [topic2] commit (parent 1)
  • (2) [draft] [topic1] commit (parent 1)
  • (1) [public] commit

And when I try to push that into heptapod I get :

searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 1 changes to 2 files (+1 heads)
remote: 2 new obsolescence markers
remote: transaction abort!
remote: rollback completed
remote: rejecting multiple heads on branch "default:topic2"
remote: (2 heads: 15efbb20c9bd 9f0e80638fe9)
abort: push failed on remote

Any chance of getting this to work ? Also if there is a workaround while waiting for a proper fix, I'm all ears ;-)

Edited Mar 27, 2019 by Georges Racinet
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information
Assignee
Assign to
Time tracking