Skip to content
GitLab
  • Menu
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 183
    • Issues 183
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 1
    • Merge requests 1
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & 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
  • heptapod
  • heptapodheptapod
  • Issues
  • #333
Closed
Open
Created Aug 23, 2020 by Georges Racinet@gracinet🦑Owner

User feedback for commits introduced by Merge Requests

Quoting @muxator on mercurial/hg-git!38 (merged):

There is probably a UI bug in Heptapod. Before merging, I rebased this PR to keep the history linear. Yet the web UI showed that merging this PR would have created 3 commits: 2 normal ones and a merge commit. Upon merging, Heptapod did the right thing and no merge commit was created. This could have been much disorienting to a newcomer.

I've actually known about this for a long time, but never got around filing it properly.

In the Git case, the merge commit would be systematic with the :merge merge method.

It's probably harder to fix than it looks, depending how much of that display is implemented in JavaScript. Also, it's possible that the piece of code handling the display wouldn't have access to the information whether the MR is actually linear or not. In that case, I suppose being less definitive in the message would be the best thing to do.

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