|
You might like to try the following -
Use Visual Studio with Git (MSSN)
https://msdn.microsoft.com/en-us/library/hh850437.aspx
Git Tutorial - How to Version Projects with Git
http://www.ralfebert.de/tutorials/git/
A succesful git branching model
http://nvie.com/posts/a-successful-git-branching-model/
Understanding the Git Workflow
https://sandofsky.com/blog/git-workflow.html
GitFlow Workflow Tutorial
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow
Also, note that Atlassian SourceTree (GUI) has built-in support for GitFlow (a big plus, IMHO).
Atlassian also have a number of pretty good tutorials at https://www.atlassian.com/git/tutorials.
No, I'm not employed by them, I'm just a beginner in all things VCS who found some good guidance there... 
Finally, 'Pro Git' is available (various formats) as a free download at http://git-scm.com/book/en/v2.
This is something of a Git Bible and highly recommended by more knowledgeable people than I.
|
|
|
|
|
Good stuff here. Thanks for posting the links. I use Bitbucket (Atlassian) with tortoise git. I have used SourceTree and don't like it as much as tortoise.
|
|
|
|
|
I've heard of Tortoise but hadn't looked at it much - it does look to be way more capable than SourceTree but also (for a beginner, like me) a bit overwhelming?
However, once I feel more comfortable with Git I can see myself using Tortoise so thanks for the heads up
|
|
|
|
|
Hello Mike.
I read great advices, I have nothing to add.
I generally use Bash shell on Windows, and I'm fine.
When I feel I need a GUI, I use SourceTree by Atlassian, the best one IMHO.
I use even VS2013 integration (generally only for quick committing), and I used TortoiseGit due its facility when migrating repositories from SVN.
Anyway, I'm writing a book about Git for beginner, Git Essentials.
If you like, I can send you an invite to get it for free when available
Please follow me on my blog (JesusWasRasta.com) or Twitter @jesuswasrasta to get in touch.
Bye!
Nando
|
|
|
|
|
Git extensions is supposed to integrate a gui with visual studio; take it or leave it, but I had the option to install git bash at the same time.
That produces the familiar git cli, which does pretty much everything the usual way.
Just need to change paths to Linux style forward slashes, eg c:\temp\temp -> /c/temp/temp in git bash cli.
Otherwise everything is familiar. I find it excellent.
|
|
|
|
|
These are my suggestions:
Pro Git Book[^]
Very good introduction for beginners. Do not need to read the whole book. The first three chapters will teach you the basics and the main use cases.
msysgit[^]
This is the ultimate git in command line for windows. It allows you to use it from any command prompt, not just git bash.
Git is somehow different than SVN and I believe that you *need* to use the command line. I use SourceTree and GitHub client in order to visualize changes between commits. It is also handy for a simple commit. For anything more advanced (create a branch, rebase, merge), I can only do it with the command line. The good thing is that I can easily start a command prompt at the repository location from these two tools.
|
|
|
|
|
I use SmartGit. It's standalone, which I like. I usually use it on Windows, but it also works on OS X.
|
|
|
|
|
Mike Hankey wrote: I went to retrieve a file a little while ago and noticed a months worth of work missing, simply vanished out of the repository.. this is the last straw and I want to migrate to GIT
Seems to me the more fundamental question is why did the work disappear. If you don't know what happened, then switching may, or may not, fix the issue.
We can program with only 1's, but if all you've got are zeros, you've got nothing.
|
|
|
|
|
From all the research I've done there's a bug in SVN where it occasionally just loses data. Along with all the other flaky crap that I've endured over the years with SVN it's just time.
New version: WinHeist Version 2.1.0
My goal in life is to have a psychiatric disorder named after me.
I'm currently unsupervised, I know it freaks me out too but the possibilities are endless.
|
|
|
|
|
Well, yeah, if you're running into bugs like that, then loose it
We can program with only 1's, but if all you've got are zeros, you've got nothing.
|
|
|
|
|
Another vote for GitExtensions. I've been using Git for 4 years now and I haven't found another frontend that I like better. It's probably worth noting that, for me, "better" == "more functional". Eye candy is not a consideration for me.
That said, I haven't tried SourceTree yet. It looks like it could be a strong contender, so I will be checking it out.
I was rather unimpressed with GitHub's frontend. It felt extremely limiting, and some of the things they did to "simplify" Git didn't make sense to me. it's probably fine if you just want to use GitHub, but not what I'd recommend if you actually want to learn Git.
|
|
|
|
|
RASPeter wrote: Another vote for GitExtensions
I tried;
GitHub - Very unimpressed, very limited
SmartGit - Still evaluating
SurceTree - Nice features, nice to look at but rejected in favor or SmartGit
TortoiseGIT - Evaluating but I really like it, mainly because it has a lot of functioinality and I've been using it, with SVN for years.
GitExtension - Evaluating, I really like it, powerful but not a real looker.
Can't remember others but I've looked at all I could get my hands on. Spending the time to try and learn the basic before I put it on, and switch on my development/production/main/personal/etc machine. Evaluating all this on a VirtualBox VMWindows 10, which I am also evaluating.
New version: WinHeist Version 2.1.0
My goal in life is to have a psychiatric disorder named after me.
I'm currently unsupervised, I know it freaks me out too but the possibilities are endless.
|
|
|
|
|
I have limited experience with GIT and simple needs when I do use it, but I get by with VS2013 and the GitHub for Windows client. Depending on your situation, those might work for you too?
For advanced stuff I use Google + command line. I try not to visit there too often.
|
|
|
|
|
I personally like SourceTree. I use it on my Mac but because of the tools we use at work I have to use Windows XP and SourceTree does not support it.
However, I have been the administrator for and SVN repository for close to 10 years. For that entire time I have followed at least the TSVN users list and for a lot of that time the SVN users and developers list. I have *never* heard of anyone loosing data like that. You should verify that your repository is not corrupt. If it is then you may have a hardware problem (eg, bad ram or disk) or you did not setup SVN correctly (eg, share a repository that's accessed as a file etc.)
Information does not "just vanish" out of the repository. In fact Subversion does not even support removing data from the repository. Oh, you can delete a file but if you go back to a revision where that file existed, it's all still there.
Now, I am not trying to convince you not to switch. I like git too. I am just suggesting that there may be an issue here that you have not thought of. For example, if you server is having problems and you migrate to git you will just have problems with git.
Also, git has its own set of minefields so make sure you understand them.
Good luck.
Wayne
|
|
|
|
|
I've been using the same repository for some 8 years and never noticed any lose but have had some strange things happen. My biggest bitch with SVN is the branching/merging, it's always an ordeal for me to reintegrate a branch back into the trunk. Seems like you have to hold you mouth just right and hope the thing works. I use AnhkSVN in VS2013 and it's hit and miss with it, may I should try VisualSVN instead.
I have doubts about my drive, been having some weird problems with it recently;
- couple startups ago did a disk check and not sure why
- Ran a dskchk the other day and it hung at 10%
so I've ordered another disk and it's on it's way should be here in a couple of days and I will off load all important data to it and use the faulty disk for scratch until it dies. Also when I do the disk clone I will replace the repo with a 5 day old backup I have. I'm a firm believer in backups and instead of monthly will go to incremental weekly when I'm busy developing.
Have been trying to learn Git for the last couple of days and there are some things I really like about it but it's a strange beast to say the least. One thing I will say about it is there are a lot better tools than for SVN. Since all this started I've looked for a stand along SVN tool and haven't really found anything that's worth a crap, except TortoiseSVN.
New version: WinHeist Version 2.1.0
My goal in life is to have a psychiatric disorder named after me.
I'm currently unsupervised, I know it freaks me out too but the possibilities are endless.
|
|
|
|
|
I personally prefer Mercurial, which has the very nice TortoiseHg Workbench GUI[^], distributed with the TortoiseHg Explorer extension. I also use Atlassian SourceTree[^] and (of course) the command-line.
For Git (which I have used and do use when I need to)...well, the only decent GUI I've found on Windows is SourceTree, and really the command-line is the next best option. You're going to need to use the command-line at some point with git, so it's probably best to be familiar with it...
Java, Basic, who cares - it's all a bunch of tree-hugging hippy cr*p
|
|
|
|
|
Really the only reason I picked Git is it's growing in popularity and I get quite a bit of stuff from GitHub so it seemed logical.
New version: WinHeist Version 2.1.0
My goal in life is to have a psychiatric disorder named after me.
I'm currently unsupervised, I know it freaks me out too but the possibilities are endless.
|
|
|
|
|
Absolutely - I keep debating whether to move to Git... but for work projects, we have a good Mercurial infrastructure, so I'll keep using it there.
For personal projects, it's more of a toss-up - I'm more likely to be using other people's repositories (which are more likely to be Git) and I prefer GitHub to Bitbucket (which is the only free GitHub-a-like that supports Mercurial)...
Java, Basic, who cares - it's all a bunch of tree-hugging hippy cr*p
|
|
|
|
|
My main problem is if I switch to Git I will have to maintain SVN also as I have 100+ projects in an SVN repository. I tried to clone the dang thing and after about 3 hours I gave up. I could probably export and somehow get them into Git but not sure it would be worth it. 10.6GB of data!
I've got a new HDD on the way, I'm going to install it and clone the disk that the repo is on and see if that clears up the problem I was having. I removed AnkhSVN and installed VisualSVN and it seems to be a lot better extension so maybe that will cure that problem also. I would like to put Git on my machine even if things clear up but I'm in the middle of a complete rewrite of my web site (much needed) so I'm not going to fool with it right now.
A lot of the Git stuff I pull is in connection with my embedded development anyway so when I get back on it I will Git serious.
New version: WinHeist Version 2.1.0
My goal in life is to have a psychiatric disorder named after me.
I'm currently unsupervised, I know it freaks me out too but the possibilities are endless.
|
|
|
|
|
|
> An advert for a house in Indonesia has gone viral online after the woman selling it offered to throw in an unusual extra feature for free - her hand in marriage.
The catch is that it's one of these[^].
|
|
|
|
|
Good one. 
|
|
|
|
|
Not bad... 7/10 would b...uy 
|
|
|
|
|
Are you in the 7? Or in the 3?
|
|
|
|
|
Well, she's not bad, but a little too old for me
Not to mention a little to far... The commute to work would be awful! 
|
|
|
|
General 
News 
Suggestion 
Question 
Bug 
Answer 
Joke 
Praise 
Rant 
Admin 
Submit an article or tip
