|
Since you mention TFS, I'm assuming you're in the MSFT space somewhere. We use git integrated with VS.
Full disclosure, I wasn't involved with the setup, and we've had a few different repos over the years; that part may be painful, I can't say.
I like it. We've got a pretty nice strategy for making branches for each project that seems to be working well. Within your local branch, you can do a commit when you get to a milestone/need to go to another branch for bug fix/whatever without affecting the remote repository.
In fact, just this morning I did a check-in for my development branch because an alleged bug in our upcoming release needs to be investigated. So, I make a branch off of the release, get that local, and check things out. If a change is, in fact, necessary, I check in in, commit remote, do a pull request to merge that into the release, and that gets deployed for a QA double-check.
When I'm done investigating, I just go back to development branch, build, and I'm back in that change.
|
|
|
|
|
TFS without question.
I've been using git for two years now and despite knowing it quite well, despise it. Recently, my hate hasn't grown, but only because I'm the only one on my current repository. No more massive merge headaches. No devs wondering why Git suddenly refuses to pull correctly. Not having to spend almost twenty minutes pulling down a fresh copy (Git really doesn't handle binaries very well.)
The worse part of Git is the stuff it fails at, like file renames with changes. Its "integration" with Bitbuck and Jira is pretty shaky. It also encourages what I see as bad practices, such as rewriting history.
TFS, by contrast, uses a workflow I vastly prefer and it just works.
BTW, here's something I've long noticed with Git; developers avoid complex changes for fear of having to do a complex merge. This is exacerbated by the workflow Git imposes. I don't really blame them; at a place I worked last year, one merge failed so badly that ALL commits after it had to be tossed, everything was rolled back to just before the merge.Before any screams the cliche--they didn't know git--they actually knew git better than anyone I know.
|
|
|
|
|
Do you know the link to TFS ON-LINE these days? Thought I had it but what I got to looks totally different
NM - I found it - As with all things Microsoft, they changed it again
If it's not broken, fix it until it is.
Everything makes sense in someone's mind.
Ya can't fix stupid.
modified 14-Nov-17 12:18pm.
|
|
|
|
|
I do "love" how Microsoft just moves things around on their web site for no apparent reason (and without having the old link go to the new place.)
Took me a while to find it too.
|
|
|
|
|
We use Mercurial pretty much exclusively at work (my choice, mainly because its ergonomics suit our team better, and it can do everything that we need as well as Git.
However... I use Git for private projects (hello, Github!), and if I were picking a SCM tool today, I'd pick Git. Mainly because it's won the mindshare war really. And also it's got some decent GUI tools (Git Tower, GitKraken)) which take a lot of the pain away... I've even used them to do some radical rebasing which previously would have had me reaching for the git man pages...
Java, Basic, who cares - it's all a bunch of tree-hugging hippy cr*p
|
|
|
|
|
TFS is a little bit easier, but branching is not that great. Use git. Once you understand the difference between commit and push, and you understand the concepts of local and remote repository, it'll be very easy. You'll be happy you did.
|
|
|
|
|
I use git with bitbucket (free unlimited private repos for up to 5 user teams) I used to always use the command line though I found that it integrates well with visual studios, sublime text, atom. I also have just started playing around with source tree (same maker as bitbucket) it seems to be a very nice interface and may be very helpful for people who are new to git (it seems very user friendly that is).
Good Luck!
|
|
|
|
|
Is a horse whisperer a librarian with a sore throat?
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
Oh that was foal!
"the debugger doesn't tell me anything because this code compiles just fine" - random QA comment
"Facebook is where you tell lies to your friends. Twitter is where you tell the truth to strangers." - chriselst
"I don't drink any more... then again, I don't drink any less." - Mike Mullikins uncle
|
|
|
|
|
Mane! Where'dya get all this stuff?
... such stuff as dreams are made on
|
|
|
|
|
Stop whinying, you'll only encourage him more and he's got bookshelves full of it.
Installing Signature...
Do not switch off your computer.
|
|
|
|
|
Is he really that shelvish?
... such stuff as dreams are made on
|
|
|
|
|
Hay! It would behoof you to give these in-stall-ations a bit more thought before you saddle us with them and get spur-ned
Ravings en masse^ |
---|
"The difference between genius and stupidity is that genius has its limits." - Albert Einstein | "If you are searching for perfection in others, then you seek disappointment. If you are seek perfection in yourself, then you will find failure." - Balboos HaGadol Mar 2010 |
|
|
|
|
|
You should be hung for that one.
|
|
|
|
|
Are you saying OG is hung like a horse ?
Ravings en masse^ |
---|
"The difference between genius and stupidity is that genius has its limits." - Albert Einstein | "If you are searching for perfection in others, then you seek disappointment. If you are seek perfection in yourself, then you will find failure." - Balboos HaGadol Mar 2010 |
|
|
|
|
|
All's I know is that the sheep are very content.
|
|
|
|
|
Baah! I knew ewe would say that.
Ravings en masse^ |
---|
"The difference between genius and stupidity is that genius has its limits." - Albert Einstein | "If you are searching for perfection in others, then you seek disappointment. If you are seek perfection in yourself, then you will find failure." - Balboos HaGadol Mar 2010 |
|
|
|
|
|
I'd be excessively infuriated at this remark if I were OG.
|
|
|
|
|
OriginalGriff wrote: a librarian with a sore throat
That definition is full of bugs.
If you have an important point to make, don't try to be subtle or clever. Use a pile driver. Hit the point once. Then come back and hit it again. Then hit it a third time - a tremendous whack.
--Winston Churchill
|
|
|
|
|
According to the latest Gallop poll, you're correct.
"the debugger doesn't tell me anything because this code compiles just fine" - random QA comment
"Facebook is where you tell lies to your friends. Twitter is where you tell the truth to strangers." - chriselst
"I don't drink any more... then again, I don't drink any less." - Mike Mullikins uncle
|
|
|
|
|
Is that a lady of the evening I hear?
|
|
|
|
|
Now, that's a horse of a different colour!
Bad command or file name. Bad, bad command! Sit! Stay! Staaaay...
AntiTwitter: @DalekDave is now a follower!
|
|
|
|
|
Oh come on guys, only if the librarian has a little colt.
|
|
|
|
|
|