You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Before I started using gh stack, a common workflow I had was using
$ git add -A && git history fixup HEAD && git push --force-with-lease
to make a change onto a pre existing commit stack to keep the history clean. I did this since I like each stack PR to only have a single commit and every small PR response is not making the commit log look really long.
When I do the fixup all the diffs show up well and everything looks great, till I start merging. It enters the merge queue, then rejects due to unrelated history issues. Just doing github PRs based off another PR meant I could still do this though, so I'm not sure if the merge queue is just doing something strange.
#27 I also see a related discussion where the commit fixup flow is not quite working right.
bugBug Reportstopic: merge queueStacked PRs with merge queues: enqueue only bottom PR, invalid_merge_commit, incompatibility.
1 participant
Heading
Bold
Italic
Quote
Code
Link
Numbered list
Unordered list
Task list
Attach files
Mention
Reference
Menu
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
Uh oh!
There was an error while loading. Please reload this page.
Before I started using
gh stack, a common workflow I had was usingto make a change onto a pre existing commit stack to keep the history clean. I did this since I like each stack PR to only have a single commit and every small PR response is not making the commit log look really long.
When I do the fixup all the diffs show up well and everything looks great, till I start merging. It enters the merge queue, then rejects due to unrelated history issues. Just doing github PRs based off another PR meant I could still do this though, so I'm not sure if the merge queue is just doing something strange.
#27 I also see a related discussion where the commit fixup flow is not quite working right.
All reactions