3 ms·
I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits t
by TheCleric 2y ago
I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits to? Each of the people in the video should be branching off main and doing pull requests to get back into main.
- shrimp_emoji 2y agoAll that shared branch needs is submodules to bump that workflow from Ultraviolent to Nightmare difficulty.
- Spivak 2y ago> How often are you pulling from a shared branch that you are making local commits to When more than one dev is working on a feature branch? You could take feature/a, branch off feature/a.1 for your local work but at some point you gotta incorporate work from feature/a. Not so different from origin/main -> main. git pull --ff-only should really be the default (changeable) behavior.
- kazinator 2y agoThe other choice being git pull --rebase, with "git merge" being removed from the git suite.
- kazinator 2y ago> How often are you pulling from a shared branch that you are making local commits to? Every working/hobbying day for the past decade and a half.
- simooooo 2y agoGot a chuckle from this one
- gofreddygo 2y agoLike anyone gives a raccoon's ass about what they "should" be doing.