News for hackers. Stuff that matters.

A comment on Git undo: We can do better. Parent comment

Re:Git undo: We can do better by ItsMonkk on Monday June 21, 2021 @12:26PM (#27580741)
It is for this reason that I have changed my workflow to always stash first, then pull, then pop the stash and do the merges locally, then push.
[ Parent | on HN ]
Re:Git undo: We can do better by lanstin on Monday June 21, 2021 @02:07PM (#27581864)
And always diff before stash because sometimes it's just random shit I wasn't serious about, so I'll re-checkout that file and then stash the rest.
[ Parent | on HN ]