|
just always take “mine” to fix merge conflicts. gently caress those other guys
|
#
?
Aug 2, 2022 01:20
|
|
|
|
| # ? Apr 28, 2024 13:59 |
|
|
Speaking of those, it's "funny" that --ours and --their have the opposite meanings in rebase mode since git does a rebase by checking out the target branch and doing a kinda cherry-pick of each commit onto it. So if you're working on a branch named some-feature and do `git rebase main`, --ours refers to main and and --their refers to some-feature.
|
|
#
?
Aug 2, 2022 02:13
|
|
|
brand engager posted:Speaking of those, it's "funny" that --ours and --their have the opposite meanings in rebase mode since git does a rebase by checking out the target branch and doing a kinda cherry-pick of each commit onto it. So if you're working on a branch named some-feature and do `git rebase main`, --ours refers to main and and --their refers to some-feature. yes, git is endlessly confusing and hostile
|
|
#
?
Aug 2, 2022 02:24
|
|
|
mystes posted:Xerox parc really invented everything, huh turns out if you can get a place with a budget that upper management forgets about for a couple of years you can get real work done
|
|
#
?
Aug 2, 2022 02:37
|
|
|
akadajet posted:just always take “mine” to fix merge conflicts. gently caress those other guys i just always take theirs because i have impostor syndrome and obviously they know better
|
|
#
?
Aug 2, 2022 02:38
|
|
|
I almost always take theirs if the merge is looking ugly because I wrote my changes, it's going to be really easy for me to write them again on top of the new baseline. Certainly way easier than figuring out what someone else's changes actually were and rewriting them on top of my own code.
|
|
#
?
Aug 2, 2022 03:15
|
|
|
brand engager posted:Speaking of those, it's "funny" that --ours and --their have the opposite meanings in rebase mode since git does a rebase by checking out the target branch and doing a kinda cherry-pick of each commit onto it. So if you're working on a branch named some-feature and do `git rebase main`, --ours refers to main and and --their refers to some-feature. ty for mentioning this because I suspected this was the case but have never bothered to look it up while rebasing (or remembered to look it up afterwards)
|
|
#
?
Aug 2, 2022 04:00
|
|
|
like I said, hell is merging other peoples' changes the worst is when someone makes a javascript or css change and can't remember why they did it and then figuring out it was a merge gone wrong because they only merged half the changes in a conflicting changeset. But otherwise, having the gui handle merge conflicts is one of the nicer things that I don't miss about git. Or at least git in the early days, since merge conflicts generated these huge ugly blocks of text that got plopped right in the middle of the source files. All the git-managed code that I have is in my own codebases so there are never any conflicts. Maybe I should pick up git again, just so I can feel
|
|
#
?
Aug 2, 2022 04:14
|
|
|
click magic wand tool in jetbrains merge and then take a nap
|
|
#
?
Aug 2, 2022 05:54
|
|
|
brand engager posted:Speaking of those, it's "funny" that --ours and --their have the opposite meanings in rebase mode since git does a rebase by checking out the target branch and doing a kinda cherry-pick of each commit onto it. So if you're working on a branch named some-feature and do `git rebase main`, --ours refers to main and and --their refers to some-feature. just open it in kdiff where it's A and B so you've got no idea which is which and then guess!
|
|
#
?
Aug 2, 2022 08:40
|
|
|
brand engager posted:Oh that reminds me, almost everyone should change the git config so pull.rebase=true (will rebase instead of doing a merge commit if your local branch had changes not in the remote when you pull) and merge.conflictstyle=diff3 (shows what the conflicting section looked like in the common ancestor commit before yours and the other conflicting branch changed it). There's probably plenty more I don't know about, a bunch of the default git settings are terrible. i wish pull didn't even exist. if you want it then alias it yourself.
|
|
#
?
Aug 2, 2022 16:55
|
|
|
why can’t clients show the branch or tag name or something useful when merging?
|
|
#
?
Aug 2, 2022 17:38
|
|
|
i just introduced the idea of forking to a team using Bitbucket to version control a project and its variants with 10 branches with no discernible dependency structure between branches beyond the first few commits. the main branch is empty (just a .gitignore)
|
|
#
?
Aug 3, 2022 17:04
|
|
|
reporting was running like dogshit cause operations was slamming some report with a really bad query. it was taking like 10 minutes to run so i open up this function and its total rear end. i spent like an hour trying to understand what its doing and why it doesnt perform well, but it doesnt really make sense cause it should work fine. as bad as the query is the joins and the indexes look correct. I started to re-write it and then on a hunch i enter the secret code OPTION(RECOMPILE) and now its instant. the query is still really loving bad, but now i dont have to rebuild it.
|
|
#
?
Aug 3, 2022 18:16
|
|
|
Shaggar posted:reporting was running like dogshit cause operations was slamming some report with a really bad query. it was taking like 10 minutes to run so i open up this function and its total rear end. i spent like an hour trying to understand what its doing and why it doesnt perform well, but it doesnt really make sense cause it should work fine. as bad as the query is the joins and the indexes look correct. I started to re-write it and then on a hunch i enter the secret code OPTION(RECOMPILE) and now its instant. Why did you make it so bad in the first place, OP?
|
|
#
?
Aug 4, 2022 00:40
|
|
|
Shaggar posted:reporting was running like dogshit cause operations was slamming some report with a really bad query. it was taking like 10 minutes to run so i open up this function and its total rear end. i spent like an hour trying to understand what its doing and why it doesnt perform well, but it doesnt really make sense cause it should work fine. as bad as the query is the joins and the indexes look correct. I started to re-write it and then on a hunch i enter the secret code OPTION(RECOMPILE) and now its instant. if it's running bad and you don't have that option, add it. if it's running bad and you do have that option, remove it. repeat until no one actively complains
|
|
#
?
Aug 4, 2022 01:35
|
|
|
gently caress, I think I've just committed to starting a new company and rewriting a product from scratch. i.e. a product & custom project shop is quite frequently the wrong approach. Need to split into a product shop and design studio. This ironically from wanting to do the custom projects, but the product is so dire it is making me look bad. MrMoo fucked around with this message at 02:36 on Aug 5, 2022 |
|
#
?
Aug 5, 2022 02:34
|
|
|
MrMoo posted:gently caress, I think I've just committed to starting a new company and rewriting a product from scratch. get as much capital as you can, then figure out how to get it into your bank account
|
|
#
?
Aug 5, 2022 03:10
|
|
|
Deep Dish Fuckfest posted:get as much capital as you can, then figure out how to get it into your bank account i'm from the murder capital where we murder for capital
|
|
#
?
Aug 5, 2022 04:48
|
|
|
it is easier to raise in sf as a nyc company than to raise in nyc as a nyc company an astounding amount of the time
|
|
#
?
Aug 5, 2022 04:59
|
|
|
Shaggar posted:reporting was running like dogshit cause operations was slamming some report with a really bad query. it was taking like 10 minutes to run so i open up this function and its total rear end. i spent like an hour trying to understand what its doing and why it doesnt perform well, but it doesnt really make sense cause it should work fine. as bad as the query is the joins and the indexes look correct. I started to re-write it and then on a hunch i enter the secret code OPTION(RECOMPILE) and now its instant. yer a dba now Harry
|
|
#
?
Aug 6, 2022 14:56
|
|
|
chaosbreather posted:click magic wand tool in jetbrains merge and then take a nap
|
|
#
?
Aug 6, 2022 16:14
|
|
|
It's not enough to put visual studio out of business, noe they're going after Hitachi?
|
|
#
?
Aug 6, 2022 16:21
|
|
|
it's remarkable just how many moderately to very succesful businesses use ruby on rails, given how few people seem to program/learn it (at least according to the SO dev survey) and how awful it looks. dynamic types, monkey patching, active records. everything i hate, but the evidence is really stacking up against my dislike of these things!
|
|
#
?
Aug 8, 2022 11:52
|
|
|
distortion park posted:it's remarkable just how many moderately to very succesful businesses use ruby on rails, given how few people seem to program/learn it (at least according to the SO dev survey) and how awful it looks. dynamic types, monkey patching, active records. everything i hate, but the evidence is really stacking up against my dislike of these things!
|
|
#
?
Aug 8, 2022 12:40
|
|
|
I go away for a week and someone somehow messed up a rebase on idk day 2 and they've been scratching their heads the rest of the time trying to work out why their diffs to master are wrong idk what they did, from the graph is it looks like they somehow imported the changes but linearly into the branch instead of moving the branch "up" to split off master, so the branch became a list of two sequential sets of commits
|
|
#
?
Aug 8, 2022 13:51
|
|
|
lol git all you hear is rebase horror stories
|
|
#
?
Aug 8, 2022 14:39
|
|
|
I just don't use rebase. who cares, just merge. hg had it right forbidding all that nonsense by default
|
|
#
?
Aug 8, 2022 14:51
|
|
|
distortion park posted:it's remarkable just how many moderately to very succesful businesses use ruby on rails, given how few people seem to program/learn it (at least according to the SO dev survey) and how awful it looks. dynamic types, monkey patching, active records. everything i hate, but the evidence is really stacking up against my dislike of these things! a lot of saas nonsense is just glorified crud poo poo at its core, and things like django or rails are actually really productive for things like that. people who actually like sql will detest most of the database touching parts, but you sure can bang out a lot of forms in -> tables out poo poo in a very short amount of time. you don't even need to know much about sql, and i'd say django also has a significantly better chance of avoiding a lot of common sql pitfalls than a lot of mid-level engineers i've worked with. there's also a ton of pretty good extension libraries for doing pretty common things that would otherwise take quite a bit of resources to get right, things like database tree structures, tag managers and whatnot. intuitively speaking it seems to me like choosing a framework like rails or django when starting a business would be a pretty good thing - you probably have pretty limited resources, you don't have scaling issues yet, you just want to focus on shipping something. i've been on greenfield projects in node and golang where a ton of time was spent on reinventing wheels and/or researching which of half a dozen open source libraries we should use to do something that's builtin functionality in django. once the project grows big enough you start running into the usual orm limitations and scaling problems, but by then you should have the resources to deal with it, and you can actually run a pretty dang big business out of a heroku standard tier postgres database these days. TheFluff fucked around with this message at 15:37 on Aug 8, 2022 |
|
#
?
Aug 8, 2022 15:32
|
|
|
TheFluff posted:a lot of saas nonsense is just glorified crud poo poo at its core, and things like django or rails are actually really productive for things like that. people who actually like sql will detest most of the database touching parts, but you sure can bang out a lot of forms in -> tables out poo poo in a very short amount of time. you don't even need to know much about sql, and i'd say django also has a significantly better chance of avoiding a lot of common sql pitfalls than a lot of mid-level engineers i've worked with. there's also a ton of pretty good extension libraries for doing pretty common things that would otherwise take quite a bit of resources to get right, things like database tree structures, tag managers and whatnot. mystes fucked around with this message at 15:36 on Aug 8, 2022 |
|
#
?
Aug 8, 2022 15:34
|
|
|
mystes posted:I think django is easy to understand but rails seems less so in 2022 fair, i've never actually used rails myself either
|
|
#
?
Aug 8, 2022 15:36
|
|
|
TheFluff posted:fair, i've never actually used rails myself either
|
|
#
?
Aug 8, 2022 15:38
|
|
|
the companies using rails in 2022 that are big started using rails in 2013 or whereabouts when the ruby vs python thing was a little bit less settled in favor of python and ruby was the weirdos interested in it lang, like rustlang is now
|
|
#
?
Aug 8, 2022 15:42
|
|
|
bob dobbs is dead posted:the companies using rails in 2022 that are big started using rails in 2013 or whereabouts when the ruby vs python thing was a little bit less settled in favor of python and ruby was the weirdos interested in it lang, like rustlang is now
|
|
#
?
Aug 8, 2022 15:45
|
|
|
its also, like... stripe has 4000 devs and the core ruby team has a very comparable number of devs to core python team, both <100 devs. so if you're an incipient tech major like stripe is you can go and get language extensions done
|
|
#
?
Aug 8, 2022 15:54
|
|
|
distortion park posted:it's remarkable just how many moderately to very succesful businesses use ruby on rails, given how few people seem to program/learn it (at least according to the SO dev survey) and how awful it looks. dynamic types, monkey patching, active records. everything i hate, but the evidence is really stacking up against my dislike of these things! This video was really influencial at the time from what I understand. People also seemed to prefer it in general, both ASP.NET MVC and Spring Boot took more inspiration from it than than they took from Django from what I can see. Ruby on Rails started losing popularity when Node.js (async), SPAs and Mongodb became more popular. Not only was it losing market share to other ecosystems that took inspiration from it, but now the "hip" paradigms were a lot different than what Ruby on Rails offered. Why use it if you don't care about server-side dynamic web pages and SQL ORMs? The magic is suddenly not intriguing enough if you maintain a separate frontend. Ruby on Rails also gained a reputation as a framework that doesn't scale (for good reason) when e.g. Twitter rewrote their backend in Scala.
|
|
#
?
Aug 8, 2022 16:08
|
|
|
TheFluff posted:fair, i've never actually used rails myself either rails (well, activerecord really) pisses me off with all the goofy convenience methods is spews out. an integer should not have a days_ago method that returns a date/time
|
|
#
?
Aug 8, 2022 20:18
|
|
|
nudgenudgetilt posted:
|
|
#
?
Aug 8, 2022 20:49
|
|
|
Just deleted 25% of a production app's code for a dashboard without losing any features. It now runs in 1/8th the time because it makes only 1/5th the number of API calls. It was just making a poo poo load of API calls that could all be one call on a fairly rate limited API, then making a bunch of dataframes for reasons that I still dont understand but could actually be one dataframe. It feels like taking a satisfying poo poo.
|
|
#
?
Aug 8, 2022 22:09
|
|
|
|
| # ? Apr 28, 2024 13:59 |
|
|
distortion park posted:I just don't use rebase. who cares, just merge. hg had it right forbidding all that nonsense by default searching and filtering commits in git is so godawful that merging too much makes the history unreadable
|
|
#
?
Aug 8, 2022 23:03
|
|
