Home/ Questions/Q 6878409
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-27T04:43:12+00:00

I have committed some changes (r5,6,7,8) to master and pushed to origin. Other people

  • 0

I have committed some changes (r5,6,7,8) to master and pushed to origin. Other people have pulled. Now master is supposed to be deployed in 2 days, but there is an emergency and something needs to go out today. What’s the best practice for this? Do I create a new branch off of r4 and deploy that branch and then merge this branch into master? Someone on IRC said to temporarily revert them, commit, then unrevert them, but am trying to grasp how this would be better or how this works.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Someone on IRC said to temporarily revert them, commit, then unrevert them, but am trying to grasp how this would be better or how this works.

    This would create an extremely ugly history: Instead of r4-r5-r6-r7-r8-fix your history would look like r4-r5-r6-r7-r8-x8-x7-x6-x5-fix-r5-r6-r7-r8 after all the changes.

    Creating a branch off “r4” is the best solution. You should have a production branch anyway that is not updated unless something is deployed to production…

    • 0