Gregory's Server
@b0rk one of the weird problems I've had a couple times is when I go helping newcomers to git, they are using a GUI tool that I've never seen before. It ends up being a surprisingly difficult game of "hunt for the XYZ button" or worse "try to guess what the people who made this app renamed XYZ to in an attempt to be 'helpful'." which takes a while and is a bit frustrating.
I'm on "cli constantly, gui occasionally" because the cli has all the verbs I need to manipulate stuff but GUIs have better history visualisations. Usually gitk alone suffices.
@0x2ba22e11 @b0rk Same here with "helping people that use GUIs", especially github's app... I had to help rewind a bad merge on my last team because someone clicked "my changes" (or whatever that button is called) and discarded all the recent work on
mainin a way that "tricked" git into thinking it was actually up to date with main... had to rewind to before the merge and force-push a corrected merge commit, which straight up didn't appear to be possible with github's app. (at least at the time, it didn't appear to have a way to reset a branch to a prior commit?)@0x2ba22e11 @b0rk Same here with "helping people that use GUIs", especially github's app... I had to help rewind a bad merge on my last team because someone clicked "my changes" (or whatever that button is called) and discarded all the recent work on
mainin a way that "tricked" git into thinking it was actually up to date with main... had to rewind to before the merge and force-push a corrected merge commit, which straight up didn't appear to be possible with github's app. (at least at the time,...