|
Brain Candy posted:no, 'Initial Commit' is not a good commit message it's fine if the contents are just .gitignore maybe if it's just the results of a scaffolding tool but not if there's been any amount of work done
|
# ? Oct 7, 2020 22:54 |
|
|
# ? Nov 4, 2024 05:33 |
|
brand engager posted:I think swift left :? out entirely but they have this which is pretty great This works: code:
|
# ? Oct 7, 2020 23:07 |
|
Brain Candy posted:no, 'Initial Commit' is not a good commit message is it the initial commit?
|
# ? Oct 8, 2020 00:38 |
|
raminasi posted:is it the initial commit? Not unless it has --allow-empty
|
# ? Oct 8, 2020 01:10 |
|
raminasi posted:is it the initial commit? that's true, at least The Fool posted:but not if there's been any amount of work done but also this is true i was told of a repo with good commits and found one riddled with commits like 'changed the button'
|
# ? Oct 8, 2020 02:52 |
|
my most recent couple of projects has an "initial skeleton commit" that is stuff like readme, license, etc
|
# ? Oct 8, 2020 04:52 |
|
Brain Candy posted:no, 'Initial Commit' is not a good commit message git commit -m "pity bump"
|
# ? Oct 8, 2020 04:54 |
|
Carthag Tuek posted:my most recent couple of projects has an "initial skeleton commit" that is stuff like readme, license, etc yeah, same. I've also done plain "initial commit" where something was developed outside of VC and I'm basically importing an already-functioning bit of config, software, etc.
|
# ? Oct 8, 2020 04:56 |
|
Achmed Jones posted:yeah, same. I've also done plain "initial commit" where something was developed outside of VC and I'm basically importing an already-functioning bit of config, software, etc. yeah thats fine imo, just put some further info in the commit body about where it came from
|
# ? Oct 8, 2020 05:11 |
|
"Import code from source safe"
|
# ? Oct 8, 2020 06:13 |
|
My commits definitely don't meet the terrible programming thread bar
|
# ? Oct 8, 2020 09:41 |
|
i use initial commit all the time but like, it gets squashed long before i put it somewhere anyone else would see it
|
# ? Oct 8, 2020 09:47 |
|
wip wip stuff oops fix bug maybe really fix ok fixed this time add test fix test initial commit
|
# ? Oct 8, 2020 10:56 |
|
i typically expect the commit message to tell me what changed since the last commit, so idgaf what the first commit message is. might as well be blank
|
# ? Oct 8, 2020 10:57 |
|
added * to .gitignore - your welcome
|
# ? Oct 8, 2020 11:01 |
|
DaTroof posted:i typically expect the commit message to tell me what changed since the last commit, you must be disappointed a lot
|
# ? Oct 8, 2020 11:04 |
|
"initial commit" is fine because the README of your project at that point serves as a detailed "commit message" describing what's going on
|
# ? Oct 8, 2020 11:07 |
|
Soricidus posted:you must be disappointed a lot well...yeah also Symbolic Butt posted:"initial commit" is fine because the README of your project at that point serves as a detailed "commit message" describing what's going on Soricidus posted:you must be disappointed a lot
|
# ? Oct 8, 2020 11:34 |
|
I never squash my commits this would be fine if I didn't constantly gently caress up and do this Soricidus posted:wip pretty sure I'm the only person that actually looks at the commit history tho so at least I'm only ruining my own life
|
# ? Oct 8, 2020 11:54 |
|
i obsessively reorder & fixup before pushing also our senior developer does merge pulls instead of rebasing and i hate it
|
# ? Oct 8, 2020 12:56 |
|
Carthag Tuek posted:i obsessively reorder & fixup before pushing merging is acceptable on your main dev branch because then I can revert all of your broken feature at once. hopefully the merge commit tells gives me context for the overall batch of commits if you merge on your feature branch you are either a childe or monster
|
# ? Oct 8, 2020 13:54 |
|
Squash rebase is the only way to fly. I don't give a gently caress about your branch commits
|
# ? Oct 8, 2020 14:09 |
|
gonadic io posted:Squash rebase is the only way to fly. I don't give a gently caress about your branch commits
|
# ? Oct 8, 2020 14:17 |
|
Brain Candy posted:merging is acceptable on your main dev branch because then I can revert all of your broken feature at once. hopefully the merge commit tells gives me context for the overall batch of commits i mean when he wants to push but cant because he isnt up to date, he merges instead of just pulling my poo poo and rebasing his poo poo on top the merge commit that creates is worthless
|
# ? Oct 8, 2020 14:35 |
|
Carthag Tuek posted:i mean when he wants to push but cant because he isnt up to date, he merges instead of just pulling my poo poo and rebasing his poo poo on top Git novices do that because its the default behavior of git pull. Tell them to set the config option to rebase on pull and your problems will be solved
|
# ? Oct 8, 2020 14:50 |
|
but hes the senior dev
|
# ? Oct 8, 2020 14:53 |
|
Carthag Tuek posted:but hes the senior dev
|
# ? Oct 8, 2020 15:01 |
|
merge pulls should not exist and they definitely shouldn’t be the default pull and they definitely definitely shouldn’t get suggested to users when a push fails. pull should be a special snowflake alias that lazy users set up. i hate pull so much.
|
# ? Oct 8, 2020 15:17 |
|
What does it matter as long as you're squashing features into a single commit before merging them into master?
|
# ? Oct 8, 2020 15:18 |
|
I use merge commits to generate change logs with small scripts likeSh code:
|
# ? Oct 8, 2020 15:31 |
|
jesus WEP posted:that does not have anything to do with being a git novice guess i shouldve said "but im the junior dev" i dont wanna deal with any of it, im just annoyed ugh
|
# ? Oct 8, 2020 16:31 |
|
Carthag Tuek posted:guess i shouldve said "but im the junior dev" Nobody gives a poo poo if you're junior, make a case for actual improvements that could be made by making changes and people will listen
|
# ? Oct 8, 2020 16:34 |
|
Twerk from Home posted:What does it matter as long as you're squashing features into a single commit before merging them into master? sometimes multiple commits for a thing is okay, since you have prereqs for your new stuff if you mix refactoring existing into your new stuff i will hate you. it's a small hate but yeah I will
|
# ? Oct 8, 2020 16:37 |
|
atomic commits or i go nuclear
|
# ? Oct 8, 2020 18:07 |
|
Twerk from Home posted:What does it matter as long as you're squashing features into a single commit before merging them into master? don't loving do this because the person who has to debug an issue in production at 3am and needs to git bisect to do it will want to murder you for mashing ~10,000 (or even 100) loc changed into a single commit keep your commits atomic, well described, and logically distinct regardless of how many you make
|
# ? Oct 8, 2020 18:11 |
|
Blinkz0rz posted:don't loving do this because the person who has to debug an issue in production at 3am and needs to git bisect to do it will want to murder you for mashing ~10,000 (or even 100) loc changed into a single commit does this work in monorepos with hundreds of engineers in them?
|
# ? Oct 8, 2020 18:14 |
|
Twerk from Home posted:does this work in monorepos with hundreds of engineers in them? Blinkz0rz posted:don't loving do this
|
# ? Oct 8, 2020 18:26 |
|
this git repo is less than 3 years old
|
# ? Oct 8, 2020 18:35 |
|
the problem i’m currently running into at work is that we effectively require every commit to master to go through (overloaded) manual qa, which means separating your preparatory refactoring from your logic changes can double to triple your time to ship because you wait for them. so we all just mash everything together, because that’s within our power, and tripling our qa headcount or improving our test infrastructure enough to convince qa to trust us isn’t.
|
# ? Oct 8, 2020 18:35 |
|
|
# ? Nov 4, 2024 05:33 |
|
I interactive-rebase my work constantly and rebase on top of mainline. I have never worked on a project with anybody else who does this but just because everybody around me regularly smears themselves in their own poo poo doesn't mean I should do likewise
|
# ? Oct 8, 2020 18:43 |