|
Shaggar posted:i think radium was off by more than 1, right folks??!?? this was my first thought too but I managed to hold it in
|
#
?
Aug 6, 2019 20:35
|
|
|
|
| # ? May 12, 2024 06:38 |
|
|
Ciaphas posted:if i ran into that trying to sabotage a former job site, i think i'd walk away feeling oddly satisfied 
|
|
#
?
Aug 6, 2019 22:02
|
|
|
i once had to work with a repo that disallowed force pushing to all branches but let us delete branches we created so i just made an alias to delete the branch before pushing every time
|
|
#
?
Aug 6, 2019 22:21
|
|
|
Plorkyeran posted:i once had to work with a repo that disallowed force pushing to all branches but let us delete branches we created so i just made an alias to delete the branch before pushing every time lmao
|
|
#
?
Aug 6, 2019 22:47
|
|
|
Soricidus posted:sounds like something is interpreting it as utf-16 instead, op i think the problem here is that our server builds are hosed up and have the classic "whatever the default of the guy that built or possibly even deployed the image was using at the time" which is pretty funny if I'm honest like iirc for years you couldn't rely on server time zone or language between environments because there was no consistency in what had actually been set up even for servers allegedly built at the same time, idk if this has been fixed. poo poo is hosed up
|
|
#
?
Aug 7, 2019 00:52
|
|
|
Plorkyeran posted:i once had to work with a repo that disallowed force pushing to all branches but let us delete branches we created so i just made an alias to delete the branch before pushing every time heck yea
|
|
#
?
Aug 7, 2019 03:01
|
|
|
Powerful Two-Hander posted:i think the problem here is that our server builds are hosed up and have the classic "whatever the default of the guy that built or possibly even deployed the image was using at the time" which is pretty funny if I'm honest just convert everything to internet time. the machines are already on the internet so it just makes sense.
|
|
#
?
Aug 7, 2019 12:15
|
|
|
Plorkyeran posted:i once had to work with a repo that disallowed force pushing to all branches but let us delete branches we created so i just made an alias to delete the branch before pushing every time This is why most of the time I hate enforcing policy via git hooks or whatever. If you have to protect your entire repo like this, then it makes me think something is seriously wrong with your whole process, and 99% of the time your git restrictions get circumvented, anyway. Just fix your process!
|
|
#
?
Aug 8, 2019 15:34
|
|
|
the purpose of things like preventing force-pushing to master should be just to catch accidental mistakes. by default git lets anyone with push access blow everything up with a minor typo, and eventually someone is going to make a bad typo.
|
|
#
?
Aug 8, 2019 17:00
|
|
|
also to prevent software fuckups from those lovely gui tools for git that hide the work they're doing behind colorful buttons with incorrect terminology
|
|
#
?
Aug 8, 2019 21:32
|
|
|
source tree is the least bad way to use git
|
|
#
?
Aug 8, 2019 23:42
|
|
|
cant remember git commands? heres some check boxes labeled with the commands. wait why are we building this software again
|
|
#
?
Aug 9, 2019 02:17
|
|
|
Finster Dexter posted:This is why most of the time I hate enforcing policy via git hooks or whatever. If you have to protect your entire repo like this, then it makes me think something is seriously wrong with your whole process, and 99% of the time your git restrictions get circumvented, anyway. Just fix your process! It can work but you need everyone to be acting in good faith. Like the place I work at sends PRs back automatically if the build fails, but you can override that. Review is required, but you can override that. Pushing to master isn't allowed if staging is broken, but you can override that. It's very rare that anything gets overridden, though, because everyone understands that they're escape hatches for exceptional circumstances and following the guardrails will save everyone effort and pain in the long run. But I dunno if force pushing master is forbidden. That's the kind of thing like, if you have to make a law against it you're already hosed.
|
|
#
?
Aug 9, 2019 02:58
|
|
|
rm will refuse to remove the root directory unless you give it a very specific command line flag to tell it that it's okay. This is entirely to prevent accidents. It's okay to have something similar to stop people from accidentally force pushing master. (Now, if you have people trying to deliberately force push master, that's a different story, and the right answer is to cut them off from the repository entirely and also stop giving them money)
|
|
#
?
Aug 9, 2019 03:17
|
|
|
Jabor posted:(Now, if you have people trying to deliberately force push master, that's a different story, and the right answer is to cut them off from the repository entirely and also stop giving them money)
|
|
#
?
Aug 9, 2019 03:26
|
|
|
Bloody posted:source tree is the least bad way to use git Personally, I think VS Code's git integration is almost perfect as a hybrid git tool. GUI for showing modified files, staging them for commit, a great diff tool+editor for merging, and a nice menu for a few other common operations. Then use the built in terminal for any complex git commands. Most Git GUI tools seem to hit the problem that CRIP's talking about if they include any more advanced functionality.
|
|
#
?
Aug 9, 2019 03:56
|
|
|
https://git-fork.com is p dece and only uses git terminology afaik
|
|
#
?
Aug 9, 2019 04:03
|
|
|
Sublime Merge is pretty new and good. It's neither too complicated nor to detached from git's general API, IMO. you have to pay the $99 license fee for dark mode on OS X, but I expensed that to the company :p.
|
|
#
?
Aug 9, 2019 04:22
|
|
|
Jabor posted:rm will refuse to remove the root directory unless you give it a very specific command line flag to tell it that it's okay. This is entirely to prevent accidents. I was about to agree with you but then I thought some more. You can block force pushing master but if you've still got a workflow that's "push stuff to master, but the right stuff, not the wrong stuff that we don't want in master" then you haven't fixed the problem, only the easiest symptom to treat. The problem being that your people are spending time on commit janitoring when you could be using a tool that would do it faster without loving it up. GitHub PRs, Phabricator, Gerrit, whatever. git push origin master isn't something that should be run directly except in unusual situations. Ofc master will still be hosed from time to time but at least it will be a higher-level issue and not faulty commit janitoring.
|
|
#
?
Aug 9, 2019 04:49
|
|
|
mercurial handles these much better imo by hiding all the dodgy stuff behind extensions and through its public/private commits concepts. it also has a saner cli.
|
|
#
?
Aug 9, 2019 11:45
|
|
|
idk mercurial seems kinda capricious
|
|
#
?
Aug 9, 2019 12:08
|
|
|
Krankenstyle posted:https://git-fork.com is p dece and only uses git terminology afaik yeah this is real nice, I used it for a bit but then got told that "our standard is git extensions" which is OK i guess, but it's diff tool is rear end idk why MS can't get their poo poo together with VS git integration.
|
|
#
?
Aug 9, 2019 13:06
|
|
|
git sucks, but worse is better - as the 21st century has so conclusively proved
|
|
#
?
Aug 9, 2019 13:33
|
|
|
it's magit, op, the only way to fly
|
|
#
?
Aug 9, 2019 13:36
|
|
|
Krankenstyle posted:idk mercurial seems kinda capricious the entire CI/CD pipelines of most businesses is kinda capricious anyway
|
|
#
?
Aug 9, 2019 14:14
|
|
|
Phobeste posted:it's magit, op, the only way to fly ban this sick filth
|
|
#
?
Aug 9, 2019 14:18
|
|
|
MononcQc posted:the entire CI/CD pipelines of most businesses is kinda capricious anyway if its only kinda youre in good shape if your previous lead dev rolled his own CI because he was angry at Jenkins then youre in trouble
|
|
#
?
Aug 9, 2019 14:54
|
|
|
i've been using smartgit for years and generally like it. sublime looks like it might be worth a look
|
|
#
?
Aug 9, 2019 15:14
|
|
|
I finally love big brother; nothing but git command line for me. if I have a really hard to look at diff or merge, I'll pop beyondcompare. if I want to review larger swathes of history, I'll look at my forge if git log --oneline --graph --all doesn't cut it for me i'm a very very aggressive user of code:from my ~/.gitconfig: code:The "git untracked" alias is kinda not good, it's kind of allowing me to route around the fact that I haven't added certain file types to my .gitignore in some repos. otoh, it does save some time when I do this: code:code:prisoner of waffles fucked around with this message at 15:49 on Aug 9, 2019 |
|
#
?
Aug 9, 2019 15:46
|
|
|
i p much only use the git cli for git mv these days, its faster than doing it in Fork. everything else i just mash big buttons with my fisherprice mouse
|
|
#
?
Aug 9, 2019 15:58
|
|
|
I use fossil for my stupid home projects and it's very needs suiting
|
|
#
?
Aug 9, 2019 19:02
|
|
|
Zlodo posted:I use fossil for my stupid home projects and it's very needs suiting For home projects what do you need to do other than "git commit am"?
|
|
#
?
Aug 9, 2019 19:14
|
|
|
gonadic io posted:For home projects what do you need to do other than "git commit am"? well basically that, except that fossil doesn't sometimes poo poo itself for inscrutable reasons also being able to easily browse the history in a browser to look at what your code was like before you broke everything is nice
|
|
#
?
Aug 9, 2019 19:22
|
|
|
forge built into VCS tool: not a bad idea
|
|
#
?
Aug 9, 2019 19:26
|
|
|
i like git gui for reviewing what's changed and picking which bits to commit. plus it's written in tcl/tk and as an aging nerd who misses the 1990s i feel that kind of thing ought to be encouraged
|
|
#
?
Aug 9, 2019 20:43
|
|
|
git add -p is the only way i add changes now. works great!
|
|
#
?
Aug 9, 2019 20:56
|
|
|
i prefer visual tools for dealing with changes - the vs merge conflict editor is hecka good, and i like the tortoisegit log viewer. git gui is nice for staging changes (especially for hunks, which i find useful because i often have a lot of bullshit uncommittable changes around to make dev easier). for loving around with branches and pulls and stuff, the command line is fine. hub sync is great even if you don't use github
|
|
#
?
Aug 9, 2019 22:54
|
|
|
*steve brulishly* hunks are great ahehhhsgh
|
|
#
?
Aug 9, 2019 23:00
|
|
|
intellij's built in git thing is really good actually, and so is the merge tool
|
|
#
?
Aug 10, 2019 00:11
|
|
|
|
| # ? May 12, 2024 06:38 |
|
|
redleader posted:i prefer visual tools for dealing with changes - the vs merge conflict editor is hecka good, and i like the tortoisegit log viewer. git gui is nice for staging changes (especially for hunks, which i find useful because i often have a lot of bullshit uncommittable changes around to make dev easier). for loving around with branches and pulls and stuff, the command line is fine. hub sync is great even if you don't use github im also an idiot who continues to use vim. ive spent too much time getting all my terminal poo poo just how I like it to migrate to other options at this point.
|
|
#
?
Aug 10, 2019 00:41
|
|