Someone poked Blakey about Git again
-
@cark said in Someone poked Blakey about Git again:
@dkf Rebase. I do it like 20 times a day
-
@El_Heffe O...kay. Whatever floats your boat I guess...
-
@anonymous234 said in Someone poked Blakey about Git again:
These are not things inherently caused by Git being a DVCS, they are simply because Git is doing something better than SVN.
I never said that these desirable features were because I was using a DVCS.
@anonymous234 said in Someone poked Blakey about Git again:
The obvious solution for everyone is to use a fast, centralized VCS that has local checkpoints (I think TFS calls that "shelving"?) and uses whichever algorithm Git uses for merges.
Why? How is that better than just using git as a faster SVN with nice history rewriting and real tags? What about git makes it unsuitable for this simple use case? And what about the locking features of the various git servers make it unsuitable for the case where you need file locking?
I used Visual SourceSafe (Safe? ha!) for a year or so. I used SVN for about five years. I've stuck with git for the past ~seven because once you get over the initial jargon and concept hump, it's by and large a good tool.
-
@sh_code all things considered, Git did more good than harm to software development world. Almost everyone using Git was previously using SVN, which until 2008 couldn't even merge properly.
-
@bugmenot said in Someone poked Blakey about Git again:
the case where you need file locking?
I have still never seen such a case.
-
@Gąska I always hear people talking about this, but never anything beyond vague assertions. Even before 2008, I never had a serious problem with SVN merges.
-
@LB_ said in Someone poked Blakey about Git again:
I have still never seen such a case.
The cases I've seen have been where there's been no sane way to do merging of changes in large files, such as with a big binary blob that makes up some critical assets that the project needs. I'm of the opinion that that's something that happens when someone is
-
@dkf I'm of the opinion that putting binary blobs into source control is already
-
@dkf said in Someone poked Blakey about Git again:
merging
@dkf said in Someone poked Blakey about Git again:
binary
I think I've spotted the problem
-
@masonwheeler Where else are the graphics for my website supposed to go?
-
@Unperverted-Vixen The fundamental purpose for source control is providing a historically-versioned backup for documents that are frequently edited, often in a collaborative fashion, where there is frequently a need to look back at the history of a document to see how it has been changed and why.
How many website graphics does this apply to? Essentially zero, so just put them on the server.
-
@masonwheeler said in Someone poked Blakey about Git again:
Even before 2008, I never had a serious problem with SVN merges.
Have you ever had branches that are indirect descendants of trunk? It takes real SVN properties magician to merge them back.
-
@Unperverted-Vixen said in Someone poked Blakey about Git again:
@masonwheeler Where else are the graphics for my website supposed to go?
If only there was a plaintext format that could describe an image...
As for photos, I don't think they need to be version-controlled...
-
@blakeyrat said in Someone poked Blakey about Git again:
If Git were as simple and accessible as a steering wheel (and, hell, a manual gearbox for that matter!) nobody would be having this discussion.
Linux Torvalds (allegedly) wrote the initial version of Git, from scratch, in two weeks. I think that tells you everything you need to know.
-
@masonwheeler said in Someone poked Blakey about Git again:
@Unperverted-Vixen The fundamental purpose for source control is providing a historically-versioned backup for documents that are frequently edited, often in a collaborative fashion, where there is frequently a need to look back at the history of a document to see how it has been changed and why.
How many website graphics does this apply to? Essentially zero, so just put them on the server.
Really? So you will have absolutely no way to recreate a previous build. No, graphics go in source control. period. If a file is needed to create a build, it's in source control - regardless of its type.
-
@masonwheeler said in Someone poked Blakey about Git again:
@Gąska I always hear people talking about this, but never anything beyond vague assertions. Even before 2008, I never had a serious problem with
SVN mergesUPS deliveries.
-
@masonwheeler said in Someone poked Blakey about Git again:
The fundamental purpose for source control is providing a historically-versioned backup for documents that are frequently edited, often in a collaborative fashion, where there is frequently a need to look back at the history of a document to see how it has been changed and why.
That may be the "fundamental reason," but it's not enough for the real world (e.g., reproducible builds, as already mentioned). Where are you going to store those binary artifacts like graphics, which aren't something that you generate from some kind of source control? How do you keep them together with the source code?
-
@El_Heffe said in Someone poked Blakey about Git again:
Yes.
504. Gateway Timeout. Quora is temporarily unavailable. Please wait a few minutes and try again.
No, fuck you. I don't think I will. Welcome to the Internet.
I've read most of the e-mail flame war threads anyway. :D
-
@masonwheeler said in Someone poked Blakey about Git again:
I always hear people talking about this, but never anything beyond vague assertions. Even before 2008, I never had a serious problem with SVN merges.
Sometimes it worked. Possibly often. But sometimes it failed in a big heap and found a way to tell you that everything in the file had changed even though you'd only edited a couple of lines. Never worked out what was the trigger for those episodes; it wasn't something obvious like line endings.
-
@masonwheeler said in Someone poked Blakey about Git again:
I'm of the opinion that putting binary blobs into source control is already
Yes, but sometimes you gotta do it anyway. Those icons aren't really reducible to source (unless you use a format like XPM, but those are deeply odd).
…
I guess you could use SVG as a source format if you had a good way to process it. It's just that doesn't seem to be what happens.