I suppose it is worth pointing out that a 'revert' in git is just an undo update. The code history in Git is write-once. Git never deletes anything. So, in a revert update, based on the reverted change: any lines that were added are removed, and any removed lines are re-added. So, a revert is a new update, it just an inverted update to cancel out a previous one.

Revert PRs are not at all special to Git, it's just another update. Once a revert is merged, a person can revert the revert update, add more changes to it, and then merge all of that as one bundle.

So, a flow might be like this (the letters on the left hand side represent the commit ID, AKA the commit SHA):

Changes to the code base are "squashed" together. When a person clicks the revert for the revert, that creates a new proposed change. Bug fixes can be added to that proposed change, then it'll all be squashed together as a single commit that is then released.

For example, when reverting the revert, this change would be proposed:

In that proposed change, we can add the bug fix, eg:

Then, when merged, that would land on the main branch and in the history as one commit, eg:

@RogerCooper I missed your earlier question and didn't quite address it in my last response to ubernaut.

Updates can be rolled back from the Github (GH) web-UI by clicking buttons.

First, find the PR with the update that should be rolled back and find the 'revert' button. Click that, GH will create a PR with a revert for the update. That can then be merged like any ordinary update. All of that can be done with button clicks, for example:

Note the revert button in bottom right:

Then, in the new PR that is created by GH, clicking 'auto-merge' will merge the update once the build checks have passed:

@Nothingtoseehere You will need to use workarounds here or play at https://www.axisandallies.org/forums/
PBF works fine there, as the forum-software is on a lower (but compatible) version than here.

@Panther said:

@Nothingtoseehere

Indeed, this is already addressed here: https://github.com/triplea-game/triplea/issues/14440

Also this is independent from the new release and new dice-server.

Yeah, that's the issue I was looking at when I had problems with PBF.