2 ms·
> It occurred to me while I was writing this that it would probably have worked to make one commit on master to remove the back-end files again, and then rebase
by OJFord 10y ago
> It occurred to me while I was writing this that it would probably have worked to make one commit on master to remove the back-end files again, and then rebase the entire topic branch onto that commit. But I didn't think of it at the time. And it's not as good as what I did do, which left the history as clean as was possible at that point.
- barrkel 10y agoHe could have made the reversion commit on a local branch (branched from master), then rebased interactively to reorder / squash commits. It presupposes that the commits are clean and well-separated though.
- soft_dev_person 10y agoI read that, but it doesn't read like he is aware of the option to revert a commit directly. More that he would remove them manually and commit that. Little difference, but if "as clean as possible" was the goal, I think that would be the cleanest. [edit] added the little words that my keyboard seems to filter out.
- OJFord 10y agoMaybe you're right; I agree that's probably what I would have done. Apart from anything else it allows a clean-slate "this is how it _should_ have been handled in the first place", rather than a separate git-fu move that was necessary or even relevant only because of the original indiscretion.