|
MononcQc posted:before pushing your branch for a review, squash it into reviewable commits that will individually work and can all reasonably be used as a forking or bisecting point This is my team and we enforce this heavily. It's very good and cool.
|
# ? Feb 5, 2021 19:45 |
|
|
# ? Apr 19, 2024 17:32 |
|
Sapozhnik posted:lol good one Open source projects where the contributors are unpaid jerks manage to do it fine
|
# ? Feb 5, 2021 21:49 |
|
commit hygiene is for peeps who dont use git bisect
|
# ? Feb 5, 2021 21:53 |
|
it's also nice if you got things like VSCode gitlens that show the last commit's message in the margin of a line, though I figure it might be fun to have a project where all the annotations about the history of a file are like "fixup" "fix for real", "djfnskdf"
|
# ? Feb 5, 2021 21:54 |
|
squash prs on merge and keep prs small, that way you have a clean history on your shared branch but can do git commit -m "loving work already" to your hearts content
|
# ? Feb 5, 2021 22:00 |
|
that's what most workplaces I'm at ended up doing, but I liked merge commits to generate easy changelogs from awking over git logs.Sh code:
code:
|
# ? Feb 5, 2021 22:53 |
|
shoeberto posted:I'm starting to see how Github's ubiquitousness is causing issues like this with younger programmers. I'm currently training a guy who's very sharp, but because Github/Bitbucket/et al hide so much of the detail in VCSes, there are just fundamentals that he doesn't grasp without a good bit of discussion. Like we do per-commit reviews and he was super confused at why it didn't work like a PR. (Not really a criticism of him, he's learning very quickly, considering) I freely admit that I don't know much about git and rely on an ide, but I know enough about how the commit trees work and what should be happening which is enough to decode the nonsense messages you get and look at it and go "oh ok I see what's happened" or when to not do something but idk I feel like just googling stuff or sitting and thinking about what might be going is a super power sometimes... Like this sql planner issue the India response was "well, the one thing changed recently was to add this where clause therefore, instead of it being" and Foo.id = (selec t id from bar where name='butts')" we hard coded it to" foo.id=1" and it worked for some reason" I had to explain that all they've done is force a plan recompile and produced a plan optimised for their test case. For the second time. Edit: looks like awful app sanitised or fails to post sql statements so I had to put a space on "select" Powerful Two-Hander fucked around with this message at 23:28 on Feb 5, 2021 |
# ? Feb 5, 2021 22:55 |
|
xtal posted:If you only use proprietary poo poo ware that your work provides, then you don't really have tech skills beyond your work's proprietary poo poo ware thank u, rms
|
# ? Feb 5, 2021 23:22 |
|
when you're squashing commits (in e.g. a feature branch) do you force push at some point? or do you not push that branch to the remote until it's done and squashed? sincerely - a terrible programmer
|
# ? Feb 5, 2021 23:57 |
|
just commit every single thought that comes into your head until you have one jira with 45 commits with such enlightening comments as "made the change" Edit: i mean I am no angel. I hosed up and made two sequential commits of "fixed xyz" then "removed gaping functional gap in xyz" and didn't bother to squash it but holy poo poo that 45 commits on one fairly sinple jira was not a joke. Powerful Two-Hander fucked around with this message at 00:05 on Feb 6, 2021 |
# ? Feb 6, 2021 00:02 |
|
the onion wizard posted:when you're squashing commits (in e.g. a feature branch) do you force push at some point? or do you not push that branch to the remote until it's done and squashed? You can force push to your feature branch as long as you are the owner of it
|
# ? Feb 6, 2021 00:04 |
|
here we do one branch per PR and since there's usually only one person working on a PR at a time (exception being pairing or w/e), force-pushing PR branches happens all the time. smaller PR's are usually one commit, bigger ones can be split into multiple commits if it makes review easier (e.g. conveys intent of each change better to the reviewer, or lets them keep less context in their head at once, or w/e). once a PR is merged though it's merged into the main branch where we never gently caress with the commit history ever. we don't do long-lived feature branches here, if we're working on a multi-PR feature that needs to be released all at once we hide it behind a feature flag until it's ready. anything merged into the main branch just goes straight to production.
|
# ? Feb 6, 2021 00:05 |
|
TheFluff posted:bigger ones can be split into multiple commits if it makes review easier (e.g. conveys intent of each change better to the reviewer, or lets them keep less context in their head at once, or w/e). this is what I try and do but I have a terrible tendency to go back and correct typos and add comments or change poo poo just after also your commits are garbage and should be squashed, my commits tell a valuable story and must be preserved Powerful Two-Hander fucked around with this message at 00:11 on Feb 6, 2021 |
# ? Feb 6, 2021 00:09 |
|
xtal posted:You can force push to your feature branch as long as you are the owner of it I don't think the version of TFS we're using atm has any concept of branch ownership. pretty sure anyone could force push to master if they wanted TheFluff posted:force-pushing PR branches happens all the time. I figured something like that, I've always avoided forcing unless it's to fix a fuckup
|
# ? Feb 6, 2021 00:29 |
|
git rebase -i HEAD~# && git commit --amend && git rebase --continue && git push --force
|
# ? Feb 6, 2021 00:31 |
|
Powerful Two-Hander posted:this is what I try and do but I have a terrible tendency to go back and correct typos and add comments or change poo poo just after i do a bunch of small commits while working and then do a bunch of mucking around with reordering and squashing them with git rebase --interactive before submitting the PR for review. how much effort i put into this varies a lot though, both with the size of the PR and with how much I care about it and how charitable i'm feeling that particular day. we don't actually have anything that enforces that each individual commit should be buildable or w/e so sometimes fewer fucks are given
|
# ? Feb 6, 2021 00:45 |
|
TheFluff posted:string interpolation in perl5 does the same thing as f-strings in python except instead of putting curly braces around the variable name you just reference it with its sigil instead, like $foo. Best aspect of this is when you put an email address in a string for the first time, Perl code:
Unless you forgot to put use strict; use warnings; at the beginning of the script, in which case it raises no problems at all and just prints "example.com".
|
# ? Feb 6, 2021 00:50 |
|
Powerful Two-Hander posted:loving sql query planner performance problems can eat my asssssss extremely this. my current fave is sql server's adaptive memory grants, which are just a lovely little gently caress you Share Bear posted:print-debugging is fine for most cases it's all i have for frontend :C
|
# ? Feb 6, 2021 01:04 |
|
whoa nice syntax coloring works in yospos nowPython code:
|
# ? Feb 6, 2021 01:08 |
|
XML code:
|
# ? Feb 6, 2021 01:11 |
|
[code=json] {"lmaofu=@@~"
|
# ? Feb 6, 2021 01:14 |
|
Kind of hard to read that white text though
|
# ? Feb 6, 2021 01:14 |
|
mystes posted:Kind of hard to read that white text though *hiss* if you dont like the garbage stylesheet, you can use the bullshit stylesheet. youve made your own bed.
|
# ? Feb 6, 2021 01:16 |
|
We just commit straight to trunk and svn update on live periodically throughout the day. Nbd.
|
# ? Feb 6, 2021 01:51 |
|
The only issue we have is that we use our live DB for dev but we just try to be careful. Postgres 8.4 is pretty resilient at least.
|
# ? Feb 6, 2021 01:52 |
|
Sagacity posted:if at any point in time a programmer says something doesn't work "for some reason" then that's a red flag I worked on an application which made requests to a server maintained by another team, and periodically the responses coming back from the server would start omitting their body. 200 OK, just no content. When we told the team about it, they said "Oh yes, that happens sometimes. When it does, email us so that we can reboot the server."
|
# ? Feb 6, 2021 02:10 |
|
xtal posted:If you only use proprietary poo poo ware that your work provides, then you don't really have tech skills beyond your work's proprietary poo poo ware the trick is you resell your entire internal infrastructure and become the #1 cloud provider, op
|
# ? Feb 6, 2021 03:16 |
|
it's so sad that git became the predominant source control tool, we should've waited for a 2nd generation of dvcs tools to come out before settling down.
|
# ? Feb 6, 2021 06:48 |
|
git is the worst vcs, except for all the others that have been tried
|
# ? Feb 6, 2021 06:59 |
|
redleader posted:it's all i have for frontend :C what are you running your frontend on?
|
# ? Feb 6, 2021 08:05 |
|
Nomnom Cookie posted:git is the worst vcs, except for all the others that have been tried it's too bad nobody's ever tried mercurial :/
|
# ? Feb 6, 2021 08:15 |
|
animist posted:it's too bad nobody's ever tried mercurial :/ Tried writing it in a fast language?
|
# ? Feb 6, 2021 08:52 |
|
Zaxxon posted:what are you running your frontend on? for some reason, chrome's debugger just fails horribly as soon as it hits an async call in our old-webpack-frontend-monstrosity. so i usually just chuck some console.logs in
|
# ? Feb 6, 2021 09:13 |
|
use darcs
|
# ? Feb 6, 2021 15:50 |
|
animist posted:it's too bad nobody's ever tried mercurial :/ We actually use hg at work and I quite like it. It's got the same design paradigms as git but (imo) more friendly command syntax. Just a shame it never took off.
|
# ? Feb 6, 2021 15:56 |
|
(We're on the verge of migrating to git because of the lack of widespread hg support...)
|
# ? Feb 6, 2021 15:56 |
|
Shakespearean Beef posted:use darcs Pijul is the new darcs but they keep rewriting it so it will never be ready for use
|
# ? Feb 6, 2021 16:40 |
|
redleader posted:for some reason, chrome's debugger just fails horribly as soon as it hits an async call in our old-webpack-frontend-monstrosity. so i usually just chuck some console.logs in Flip between and Firefox, sometimes Mozilla can do something right.
|
# ? Feb 6, 2021 17:01 |
|
ctps: found a "how many times have I done operation to thing" field in a hand rolled log stored in a db This is stored as a float, and when they increment it they cast it to an int and then back to a float, and then update the value At this point you might ask yourself why are you updating a log? It is because that log is also being used as a stateful work queue, dummy How did I find this out? Because I added some logging to see what the gently caress this thing was doing and I broke it because the work queue-log parser started getting entries it couldn't handle the floating point counter is not used
|
# ? Feb 6, 2021 17:57 |
|
|
# ? Apr 19, 2024 17:32 |
|
double post
|
# ? Feb 6, 2021 17:57 |