I could spend hours and hours and hours just ranting about what an awful experience dealing with git is
-
@superjer said:
@nonpartisan said:
What were you going to do with those 2.5 - 3 seconds anyway? [tantrum] [tantrum]
I can't speak for everyone, but I would have spent the 2.5-3 seconds NOT losing my train of thought.
I tend to use those "2.5-3.0 seconds" (regardless of when they happen) to gather my thoughts into a much more focused plan. You (the general you, not anyone in particular) would be suprised what can happen with just a few seconds of reflective thought.
-
@nonpartisan said:
If you were working over a WAN link, 2.5 - 3 seconds is probably pretty good. The latency was likely the bigger factor than the Pentium 200 acting as a server. What were you going to do with those 2.5 - 3 seconds anyway? If it was really that bad, they should have considered a different tool instead.
As long as we are still talking about TFS there is no need to install a different tool. You can have a local TFS Proxy installed against which you perform your actions. It syncs in the background with the main TFS on the WAN. See this article from 2005
-
@gilhad said:
Yes, typical example: "The client send us misspelled company name, please edit it everywhere in the web pages. Also please check all their products against their official site and edit all mispelled"
The changed files are any *.html and any *.inc in any subdir, which contains some misspelled name (from unknow yet range). But not all files contains such errors.
Might I suggest that you set up your include structure in a non-retarded way so that the company name appears in one or two files (the header and/or footer file), or, hey here's an idea, in the database of a CMS?
I really hope this isn't your typical example.
-
@dhromed said:
Might I suggest that you set up your include structure in a non-retarded way so that the company name appears in one or two files (the header and/or footer file), or, hey here's an idea, in the database of a CMS?
I really hope this isn't your typical example.
It is not my typical workflow, but when the company name is not only in headers, but also in the text (the Bubletronics was founded in 1987 by two friends ... Main line of Bubletronics products contain ... We at Bubletronics consider this and that as progressive ...) and in selects (choose product: Bubletronics Aerial buble, Bubletronics Watter drop, Bubletronics Rotten roots ....) then it goes evet to include files and/or databasis. And as we do not use english, but our own language, then the name can be in more variants depending on context. And those variants are not just root with different sufixes, but sometimes even the root is modifyed. So it is not easy to splash over $companyName, not mentioning, that it is not usual to make many sites differing just with company/product nameso the text is usually not so overparametrized.
But sometimes such things occures and leads to changes in lot of files, with not simply pattern, where it should be changed. Not all clients are the best ones.
-
-
Good to see git lives up to it's name
-
-
-
-
@dhromed said:
@Helix said:
Good to see git lives up to it's name
"its"
Why can't 's be the proper possessive for pronouns? It's how nouns work.
-
@MiffTheFox said:
@dhromed said:
@Helix said:
Good to see git lives up to it's name
"its"
Why can't 's be the proper possessive for pronouns? It's how nouns work.
"it's name" == "it is name", just like "it is balloon!!!!" [F-Troop Reference]
-
@TheCPUWizard said:
@MiffTheFox said:
Reply that changes the text in all previous replies to make them more generic@dhromed said:
Non-explanation of grammar rule@Helix said:
Complaint about the inconsistency of the English languageSlightly incorrect grammar
Correction of grammar
-
@TheCPUWizard said:
"it's name" == "it is name", just like "it is balloon!!!!" [F-Troop Reference]
That show is identity eludes my memory, although Wikipedia is description makes it sound interesting.
-
@TheCPUWizard said:
"it's name" == "it is name", just like "it is balloon!!!!" [F-Troop Reference]
TheCPUWizard's got a point.
-
@MiffTheFox said:
@dhromed said:
@Helix said:
Good to see git lives up to it's name
"its"
Why can't 's be the proper possessive for pronouns? It's how nouns work.
Pronouns have dedicated possessive forms: him -> his, her -> hers/her, it -> its.
The apostrophe generally denotes abbreviation; shortening "it is" or "it has" to "it's" is an example.
In the case of the possessive, "John's bicycle" is actually an abbreviation for "John, his bicycle". To apply the same construction to a pronoun, you'd need to start from "him, his bicycle" which is redundant.
You're welcome. It's been fun.
-
@flabdablet said:
@MiffTheFox said:
@dhromed said:
@Helix said:
Good to see git lives up to it's name
"its"
Why can't 's be the proper possessive for pronouns? It's how nouns work.
Pronouns have dedicated possessive forms: him -> his, her -> hers/her, it -> its.
The apostrophe generally denotes abbreviation; shortening "it is" or "it has" to "it's" is an example.
In the case of the possessive, "John's bicycle" is actually an abbreviation for "John, his bicycle". To apply the same construction to a pronoun, you'd need to start from "him, his bicycle" which is redundant.
You're welcome. It's been fun.
-
@Hatshepsut said:
http://en.wikipedia.org/wiki/His_genitive
Sure, that was indeed a bit of a Just So story and English is indeed more chaotic than it would suggest; but it's a pretty easy rationale to remember, and doing so leads to correct results more often than not.
-
Could you guys stop posting this bullshit in my thread? This isn't English 102.
-
@blakeyrat said:
Could you guys stop posting this bullshit in my thread? This isn't English 102.
I'm pretty sure this is English 201-- a second level course, not a supplement for a first level course.
(I don't know which course em-dashes fit into, though)*
* footnotes, though, are English 102
-
@blakeyrat said:
Could you guys stop posting this bullshit in my thread? This isn't English 102.
Fuck you.
-
@dhromed said:
@blakeyrat said:
Could you guys stop posting this bullshit in my thread? This isn't English 102.
Fuck you.Sorry, that's English 324 - Teutonically Derived Slang.
-
@boomzilla said:
@dhromed said:
@blakeyrat said:
Could you guys stop posting this bullshit in my thread? This isn't English 102.
Fuck you.Sorry, that's English 324 - Teutonically Derived Slang.
Fuck you too.
-
@dhromed said:
@boomzilla said:
@dhromed said:
@blakeyrat said:
Could you guys stop posting this bullshit in my thread? This isn't English 102.
Fuck you.Sorry, that's English 324 - Teutonically Derived Slang.
Fuck you too.
English 101: the comma.
"Fuck you, too."
-
@Lorne Kates said:
English 101: the comma.
"Fuck you, too."
And fuck you.
-
@Lorne Kates said:
@dhromed said:
@boomzilla said:
@dhromed said:
@blakeyrat said:
Could you guys stop posting this bullshit in my thread? This isn't English 102.
Fuck you.Sorry, that's English 324 - Teutonically Derived Slang.
Fuck you too.
English 101: the comma.
"Fuck you, too."
I'm pretty sure that would be like English 084 or something.
-
@MiffTheFox said:
I'm pretty sure that would be like English 084 or something.
The "zero" coded are remedial, ESL and other "catch up" courses. They're fun, because you have to go over what "fuck" means.
Contrast with courses with "1" in the middle (ie: 211), which is exactly like their middle zero course (ie: 201), except for non-English majors. 211 goes over "fuck you". 201 uses more $5 words. You get to use conjugate on more than verbs.
-
@dhromed said:
@Lorne Kates said:
English 101: the comma.
"Fuck you, too."
And fuck you.
I only took the non-Major courses, so I know something's dangling there, I just don't know what.
-
@blakeyrat said:
When the guy who picked git gets back from vacation, I swear to Christ I'm going to send him on a permanent vacation.
Plus, his work “shows the patriarchal nature of the software industry.” (http://megan.geek.nz/index.php/how-git-shows-the-patriarchal-nature-of-the-software-industry/)
@blakeyrat said:Could you guys stop posting this bullshit in my thread? This isn't English 102.
Tee hee.
-
@dhromed said:
@Lorne Kates said:
English 101: the comma.
"Fuck you, too."
And fuck you.
Fuck, you two.
-
I hear you, OP. One wrong turn and you're a fucken dead man.
-
@Ron_The_Bear said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
I hear you, OP. One wrong turn and you're a fucken dead man.
git reset --hard origin/HEAD
-
@Carnage said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@Ron_The_Bear said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
I hear you, OP. One wrong turn and you're a fucken dead man.
git reset --hard origin/HEAD
In case of a series of wrong turns over a long time,
git diffandgit applycan close entire dark chapters of history. Sometimes merges shouldn't succeed.
-
@blakeyrat said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@Renan said:
I suggest using some good GUI, like Tower.
I'd love to. Know of one for the platform 95% of the people on Earth use? (Github for Windows? Not good. Before you suggest that.)
tortoiseGit. a bit ugly, takes a moment getting used to, but mostly irons over moat of the git bullshit that can be ironed over.
-
@sh_code said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@blakeyrat said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@Renan said:
I suggest using some good GUI, like Tower.
I'd love to. Know of one for the platform 95% of the people on Earth use? (Github for Windows? Not good. Before you suggest that.)
tortoiseGit. a bit ugly, takes a moment getting used to, but mostly irons over moat of the git bullshit that can be ironed over.
VSCode has a fucking pleasant git interface, at least for the basics. I can't remember the last time I touched tortoise. And it actually works on remote Linux servers as well as WSL.
-
AHem...
Git gud.
-
@dangeRuss said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@sh_code said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@blakeyrat said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@Renan said:
I suggest using some good GUI, like Tower.
I'd love to. Know of one for the platform 95% of the people on Earth use? (Github for Windows? Not good. Before you suggest that.)
tortoiseGit. a bit ugly, takes a moment getting used to, but mostly irons over moat of the git bullshit that can be ironed over.
VSCode has a fucking pleasant git interface, at least for the basics. I can't remember the last time I touched tortoise. And it actually works on remote Linux servers as well as WSL.
VSCode’s git GUI is only sane if you haven’t used Visual Studio. Otherwise you know all the stupid things it does and will be constantly fighting it. Most notably the difference with how auto stage in VS vs VSC works — if you have unsaved files and go to commit, VS saves them then auto stages everything and you’re good. If you get the “hey do you want to save this file” prompt in VSC, you’re about to screw up because now it’s only going to auto stage the files it just saved (even though it would have auto staged everything if you had saved first before committing).
-
@dangeRuss said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
VSCode has a fucking pleasant git interface, at least for the basics.
I like the Eclipse interface. It does expose more of the git bullshit than, say, IntelliJ (I've not used VSCode), but that does mean I can use it to do a lot more including fixing problems in remote repos. I've got a couple of support scripts as well (mostly to things like syncing remote branches across a lot of repositories). I'm definitely not using everything it does.
-
@dangeRuss said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@sh_code said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@blakeyrat said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
@Renan said:
I suggest using some good GUI, like Tower.
I'd love to. Know of one for the platform 95% of the people on Earth use? (Github for Windows? Not good. Before you suggest that.)
tortoiseGit. a bit ugly, takes a moment getting used to, but mostly irons over moat of the git bullshit that can be ironed over.
VSCode has a fucking pleasant git interface
As in, it pleasantly fucks git up. There's been several times I've almost disabled all VCS features out of spite (but the ability to see changed files always wins over so now I'm just careful to never click anything git-related in the UI).
-
@dangeRuss said in I could spend hours and hours and hours just ranting about what an awful experience dealing with git is:
VSCode has a fucking pleasant git interface, at least for the basics.
I just wish the buttons to show all local and remote branches would, I don't know, show all the local and remote branches.
I keep having to revert to
gitk --allorgit --all --graph --onelineto show diverging branches.Edit: never mind. I read VSStudio instead of VSCode. I don't know about VSCode.
