https://gitlab.synchro.net/main/sbbs/-/merge_requests/723#note_10170

@Deuce I saw you did a merge of master. I undid that, and rebased and force-pushed to help clean up the commit history. I'm pretty sure the only change you made was the master merge.

---
þ Synchronet þ Vertrauen þ Home of Synchronet þ [vert/cvs/bbs].synchro.net

https://gitlab.synchro.net/main/sbbs/-/merge_requests/723#note_10170

@Deuce I saw you did a merge of master. I undid that, and rebased and force-pushed to help clean up the commit history. I'm pretty sure the only change you made was the master merge. I don't want to unintentionally overwrite any changes you might have made on this PR commit.

---
þ Synchronet þ Vertrauen þ Home of Synchronet þ [vert/cvs/bbs].synchro.net

https://gitlab.synchro.net/main/sbbs/-/merge_requests/723#note_10171

We do squash merges and delete branches, so the commit history here doesn't matter... I did that to force a CI build since it can't be merged until CI is green. Just came back to do the merge and discovered a new pipeline was kicked off and it failed, so I can't merge again. :smiley:

---
ï¿­ Synchronet ï¿­ Vertrauen ï¿­ Home of Synchronet ï¿­ [vert/cvs/bbs].synchro.net

https://gitlab.synchro.net/main/sbbs/-/merge_requests/723#note_10173

Ok, next time I see changes like that, I'll leave things be. ;) I amended with no changes and force-pushed to trigger a rebuild.

---
þ Synchronet þ Vertrauen þ Home of Synchronet þ [vert/cvs/bbs].synchro.net