Re: Re: GitHub
  By: Nelgin to Digital Man on Wed Aug 26 2020 03:18 pm

 Ne> So, some time ago I added login to chat_sec.js to load the @smeg mail
 Ne> reader if it exists. I kept this in /sbbs/exec because if there were any
 Ne> changes to chat_sec.js in the future (which there were) CVS would merge my
 Ne> modifications and it worked well. I had no problems. The below procedure
 Ne> would blow away that change. Of course, I could put it in mods but then no
 Ne> updates. So no-win situation.

Nah, git will merge them in too. At first it will complain that you have a locally modified file - so you "git stash", then "git pull" and finally "git stash pop". (And if git stash pop complained of conflicts, you would manually address them, and not forget to "git stash drop && git reset HEAD ".)

Sure perhaps a different way of getting the job done, and perhaps a few more steps as well - but in the scheme of the bigger picture, git out does CVS with both arms behind your back...

...лоеп

... A mixture of admiration and pity is one of the surest recipes for affectio

---
 ю Synchronet ю Alterant | an SBBS in Docker on Pi!