Angband master branch reset on Github

[Nick]

The facts were these.

After Angband 3.5 was released, the plan was to do a restructure of the codebase; to do this, I made a branch on Github called (unimaginatively) 'restruct'. The idea was that master should be left as it was until restruct was in a sensible state, so that people looking for the main codebase would find something useable.

Then a bit later I had some bugfixes for 3.5 submitted. The correct thing would have been to apply the bugfixes to the 3.5-release branch in preparation for a future bugfix release, and leave master so it could be just fast-forwarded with all the restruct code when the time came. Instead, I thought dimly "Right, bugfixes" and applied them to master.

So the least worst option seemed to me to be to apply the fixes to 3.5-release, and reset master back to the original 3.5 release point. At our devteam meeting last week, this was agreed to - and no-one even called me an idiot - so I have now done that. This is a long-winded way of saying

If you have code downstream of angband/angband master, I've just messed up your commit history. Sorry.

[Nivim]

(Even though I don't know them, there are probably some fancy git commands to fix this; there usually are.)

[Nick]

Yes, there are various strategies for people who did have downstream code. If anyone does and has difficulties, I'd be happy to help.