libera/#mezzano - IRC Chatlog

17:56:29 fitzsim I can test general patches, at least

17:56:44 fitzsim I may not have matching hardware if the patches are hardware-specific

17:57:27 ebrasca fitzsim: How do I rejoin my fork back? Why I also don't get the same treatment as you? (I did contribute a good amount of code)

17:58:24 fitzsim I don't understand what you mean by "rejoin"

17:59:06 fitzsim do you mean, you have some changes you want to get into github.com/froggey/Mezzano?

17:59:59 fitzsim if so, the best way is what I described

18:00:39 ebrasca https://github.com/ebrasca/Mezzano , because of what I did understand from froggey I did separate my fork from froggey one to don't give him work and now PR are still acepted there

18:02:10 fitzsim ok, it looks like you have worked on the TCP implementation there; I remember you trying to make it more standards-compliant

18:03:33 Vinapocalypse merge request?

18:04:27 fitzsim have to drop, will probably be back later today

18:12:08 iska ebrasca: I can help with that

18:12:18 iska I have my own local commits

18:13:32 iska what you do is copy your modified files, checkout the last upstream commit, make a branch, copy changed files back and make commit(s). Then push that to github

18:25:36 Vinapocalypse `git stash` to move the changes aside, `git pull`, `git checkout -b YOUR_BRANCH`, `git stash --pop`, then commit

18:27:43 iska stashing only deals with uncommited stuff, he has made commits to master

18:29:46 Vinapocalypse ahh yeah

18:43:50 ebrasca Sorry for the problem

3:53:09 Vinapocalypse idk if yall have seen the "Programmers are also human" YT channel - most of their jokes are so-so to me but they did a video recently about esoteric languages which was v funny