Comment

Comment by coldtea

>I mean, that's option 2 of what you're quoting,

No, option 2 is to stash.

Their three weird options are:

(a) fix the bug on the feature branch and "try to get them both deployed together"

(b) git stash, fix the bug in a new branch, come back

(c) locally clone the repository

At least (b) is somewhat sane, but it's still weird that the even more code-managementy option of "commit your halfway feature work/create new branch for the bugfix/come back to the feature and amend/squash/soft reset" isn't even mentioned.

Your cases are more involved than the contrived scenario you give, where their weird options don't make sense.

parent coldtea 2 years ago

Discussion

Live from the official Hacker News API

A modern reader for Hacker News · SvelteKit + Skeleton