The Lounge is rated PG. If you're about to post something you wouldn't want your
kid sister to read then don't post it. No flame wars, no abusive conduct, no programming
questions and please don't post ads.
it's my understanding that git is meant to manage multiple branches easily, probably that's why is overly complex for simpler tasks like working in a one shared source tree.
Yes, I would agree. I can see where my idea of working with revision control is different. I rarely would branch my SVN tree, and the idea of keeping local a local repository with all of the local branches and changes on my computer (until they are pushed onto the remote repository) I can see as possibly beneficial but overly complex, and frankly, scares me a bit with regards to losing my work due to a disk failure or the complexity of merging my work if I fall too far behind everyone else's branches.
However, having read something recently, I am beginning to change the mental picture I have been holding - namely, that there is also a local repository as well as a remote repository. That helps me understand why a commit doesn't actually get seen on the remote server until a push happens.
It looks like you just do not need it. JIT has just 2 strong points - distributed architecture and conflict resolution. You use "I" and not "we" in the post, so it is unlikely that you can benefit from either. Besides these 2 advantages, GIT still retains its nature of a quick hack. I guess this happens because the focus is still on making things possible as opposed to making them easy or forgiving.
You use "I" and not "we" in the post, so it is unlikely that you can benefit from either.
Well, this IS for a project with a couple other devs on it.
I guess this happens because the focus is still on making things possible as opposed to making them easy or forgiving.
Those are not mutually exclusive. My client is an expert at Git and whenever he explains something, it all makes sense and I "get it", but then when I try to do something at home, it blows up for me. It's a learning curve, and I've read through books and blog posts, but there is still a disconnect between what I do, that I think is doing it right, and what ends up happening. However, my rant was at the fact that I tried to do everything possible to kill my changes and revert back to the remote repository, to absolutely no avail. I ended up deleting the entire folder and re-cloning it. When I read in the documentation that doing a "reset --hard" (or whatever the syntax is) should kill my local changes, and doing a fetch / pull / checkout should get me to the latest version on the remote, and it obviously didn't work because "git status" still returned all the changes I wanted to throw away, then yes, I rapidly come to the conclusion that it's a pile of s***.
In a sense, yes, it is that pile. When I started using GIT I created a 3 repository model of the real project and tried commands there first. We also had few developers, but thanks to the lack of coordination and frequent changes in specs and overall project direction GIT payed for itself. I guess that was what a much larger and better organized team would experience.
From the perspective of someone at the other end of the experience curve, I found Git almost impenetrable - I'm learning French right now (and I'm not a young whipper snapper), Git is harder than an entirely new language as far as I'm concerned.
I would guess that if I broke through that outer shell and was already experienced with VCS concepts then Git would be the best choice - it's an assumption since why else would so many people and companies flock to it? I am guessing that the complexity pays back later when you have lots of contributors, branches etc. and maybe Bazaar, Mercurial etc. aren't so capable at that stage..., I have no idea, but there must be some reason!
However, the most frequent comment I see and which tallies with my own experience, is "If it was my choice I'd use Mercurial".
Mercurial is so much easier to get your head around, hugely helped by TortoiseHg, from total novice to functional in minutes not years.
Wasn't going to do it again cause none of you are playing along anymore(don't blame you it's sh*t). But couldn't resist this Gem.[^]
I mean she honestly believes the School are in the wrong for not feeding her children, when she must knowingly send them to School day after day without a Packed Lunch or money to buy one. The comments are quite amusing particularly as the Mum in question turns up with the handle 'Tegs' but soon disappears when she gets rumbled. The look on the kids faces(obviously told by the snapper to look sad) is priceless too.
Post your local news crap below. The most stupid/mundane/poorly written wins.
Don't be too rough on the police. They did handle the temple shooting a short while back. Of course, the community newspaper neglected to cover it much. The only story related to it was titled "A CommUNITY Meeting[^]", which should by its title alone tell you that it isn't exactly hard-hitting journalism.