In September last year, a couple of new behaviors to its “ ” button as alternatives to the standard of creating a new merge commit every time. Namely, “Squash and Merge” and “Rebase and Merge.” GitHub introduced Merge “Rebase and Merge” is appealing if you already lean toward over for whatever reason (won’t go into that holy war here). However, it has a bug that I’ve replicated by following these steps: git rebase git merge I created a PR with two commits in it: https://github.com/jcfrancisco/rebase-revert-bug-example/pull/2 I merged that PR into master using the “Rebase” method. I clicked the Revert button on that PR, creating this revert PR: https://github.com/jcfrancisco/rebase-revert-bug-example/pull/3 Note that the revert PR only undos the second out of the two commits in the original PR. In other words, the Revert button doesn’t actually revert the PR— it only reverts the final commit in that PR. This could be a deal-breaker for products or libraries that rely on the Revert button to undo a PR’s worth of work instantly. So don’t use “Rebase and Merge” yet. GitHub is working on a fix — when I reached out to their support team, they said they have an “issue open with the team” about it but that there’s “no specific ETA on when a fix will happen.” They also said they’d email me when it is fixed, and I’ll update this post when that happens. Looks like GitHub pushed out a fix within a few hours of my emailing support, and UPDATE: the Revert button now works as intended. is how hackers start their afternoons. We’re a part of the family. We are now and happy to opportunities. Hacker Noon @AMI accepting submissions discuss advertising & sponsorship To learn more, , , or simply, read our about page like/message us on Facebook tweet/DM @HackerNoon. If you enjoyed this story, we recommend reading our and . Until next time, don’t take the realities of the world for granted! latest tech stories trending tech stories

Don’t use GitHub’s “Rebase and Merge” workflow (yet)

About Author

Comments

TOPICS

THIS ARTICLE WAS FEATURED IN

Related Stories

Untitled Story

10 GitHub Repositories to Follow

3 Easy Steps to Change Main Git Branch on Heroku

28 Stories To Learn About Markdown

194 Stories To Learn About Git

15 Tips to Enhance your Github Flow

10 GitHub Repositories to Follow

3 Easy Steps to Change Main Git Branch on Heroku

28 Stories To Learn About Markdown

194 Stories To Learn About Git

15 Tips to Enhance your Github Flow

Light-Mode

Classic

Newspaper

Dark-Mode

Neon Noir

Minty

HN StartUps