~dr|z3d
@RN
@T3s|4_
@eyedeekay
@not_bob_afk
@orignal
@postman
@zzz
%Liorar
%cumlord
+FreefallHeavens
+Xeha
+ardu
+bak83_
+mareki2p
+onon_
+profetikla
+r00tobo_BNC
+uop23ip
AHOH
Arch2
Danny
DeltaOreo
FreeB
Irc2PGuest59581
Irc2PGuest70083
Irc2PGuest70134
Irc2PGuest96449
Irc2PGuest97049
Meow
Onn4l7h
Onn4|7h
T3s|4__
acetone_
boonst
carried6590
duck
maylay
phobos
pisslord
poriori_
qend-irc2p
radakayot_
shiver_
simprelay
solidx66
thetia
u5657
weko_
zer0bitz_
dr|z3d
zzz: apparent bug here: if (ipV6) {get.forceDNSOverHTTPS(true, true);}
dr|z3d
it looks like forceDNSOVerHTTPS only takes a single boolean argument.
zzz
oopsie
zzz
fixed, sorry for the trouble
dr|z3d
no trouble, didn't compile, consulted the method, fixed it.
zzz
a little chaotic here these days, sitting on about 220 local modded and new files
dr|z3d
you've been taking lessons from eyedeekay :)
zzz
it's about 2/3 PQ but makes it hard to keep track of the non-PQ WIP
dr|z3d
not working in separate local branches then?
zzz
no, as usual I test everything all the time
dr|z3d
clone, tweak, test, merge, rinse, repeat :)
zzz
the other issue I haven't solved is when switching branches from a to b, it ofc deletes files in a but not in b, which I then have to manually put back
zzz
so I haven't figured out a workflow for that
dr|z3d
let's see if we can bisect that, or get you further down the road there?
zzz
maybe
dr|z3d
so you checkout -b whatever branch you're working on, let's say master, and then you have a new cloned branch?
zzz
I;m always in one workspace (dir) and always in master. I only switch branches to create PRs
zzz
then I switch right back to master
zzz
and if the PR had new files, I manually restore them after switching back
dr|z3d
ok, sure, safe to assume you're always in the same workspace.
dr|z3d
ok, so that part we can probably address quite easily.
zzz
I realize it's a very unsophisticated workflow
dr|z3d
you're not in master, you've got new files, you've committed them to your current non-master branch, right?
zzz
yup
dr|z3d
great, so you've got a commit hash for the new stuff. when you then checkout master again, just git merge the hash.
dr|z3d
(or hashes)
zzz
git merge is just to workspace, not a checkin?
dr|z3d
you'll see a merge commit in your logs, if that's what you're asking. merged from foo to bar.
zzz
no I just want the new files back in my workspace after I switch back to master
zzz
unchecked-in
zzz
so then when I git stash pop I'm back where I was
dr|z3d
ok, so you want git merge --no-commit {branch} or {hash} then.
zzz
ok
dr|z3d
of course, if you have non-committed stuff in master you'll still need to git stash before you checkout an different branch, or commit before checkout.
dr|z3d
so one way to address that is to always checkout from master when you've committed everything, do whatever you want in the new branch, test, and then merge back to master when you're done. and remember to nuke any stale branches so you don't have a huge number of stale branches.
zzz
old branches don't bother me
dr|z3d
well, if you're merging code back to master, then not much point keeping them around. just checkout a new branch when you need one. keeps things sane, but entirely up to you ofc.
dr|z3d
if you've merged back from foo to master with --no-commit, you'll still need to commit on master when you're ready.
dr|z3d
which sounds like what you want.
zzz
yeah will have to play with it, but merge --no-commit should be helpful, thanks
dr|z3d
no worries, anything that gets you out of the commit weeds has to be a good thing :)
zzz
my workflow is to let stuff soak unchecked-in in any branch, for anywhere from days to a year or more, but yes the weeds are out of control