Git
There are many git clients out there. When starting with git use SourceTree. SourceTree is the best git tool when starting out. It shows you everything in an easy to understand way, while being a true git client.
There are 2 other git clients that I would not recommend:
- The git tool for eclipse. I have yet to meet someone where it did not screw up their entire project.
- The GitHub client. This one is better than the eclipse one however it does not learn you how to work with git very well. When it will go wrong, you have no idea what it did and how to fix it.
On linux? Use GitKraken. It is still in beta though. If you are a command-line lover you can also use that.
↑ don't become this guy.
IntelliJ
If you haven't done so already. I would highly recommend you check out IntelliJ. This IDE works a lot better with cloning and importing your git project.
Many people have described git in many ways. This is a collection of articles. Hopefully put into an order where you get the most of every tutorial. For every link I recommend until how long you should read. However if you like it, you are welcome to keep reading.
CodeCademy course
Besides this guide, there is also a Codecademy course about git
What is git and how does it use version control
A giant GitHub guide
You have to create a github account for this course. You can read this giant guide and you will be up to date with everything.
GitHub help page
If you have problems with GitHub, you can search this help page for a solution.
GitHub education pack
Free stuff. Awesome, right!
Don’t worry if you don’t understand it all in one go. It gets better with time.
Git Magic: Chapter 1
Why version control?
Git Book: Chapter 1.3
What are the ideas behind git?
Learn git branching: First 4 levels
Try a few git commands. Don’t worry if you don’t remember the exact commands. SourceTree will have buttons for it and handle the exact code in the background.
Atlassian: Branching
What were those branches?
Git Book: Merge Conflicts
When combining stuff, it might not always go to plan.
Atlassian: Reset
These changes are not going to work out. It isn’t me, it’s you.
GitReady: Stashing
Stashing. How to put your code to the side for a while.
The git book: Ignoring Files
.gitignore is really useful. No longer accidentally commit files you shouldn't add. Many eclipse files need to be excluded, just like all the compiled files in your bin folder. (Nobody will want to see these changes). P.S. GitHub can also create a standard gitignore for you.
Git fundamentals
So now you know what git is and how it can be used. Now it is time to go deeper and learn how git works on a lower level. The talk is 46 minutes long, but really helpful. For instance, you will learn why it is not good practice to push large files to git.
https://try.github.io/levels/1/challenges/1
If you still feel like you don't know everything, you can also try this tutorial from GitHub.
Ok, I now know how people work with git. How should I be applying it?
https://www.atlassian.com/git/tutorials/comparing-workflows/centralized-workflow
https://www.atlassian.com/git/tutorials/making-a-pull-request
They were talking about something called a pull request. Pull whatta?
https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow (Until “Where To Go From Here”)
Gitflow will make your life a lot easier. No-one wants to merge your work of the entire week and has time to review it all.
https://guides.github.com/introduction/flow/
Use gitflow in GitHub
http://stackoverflow.com/questions/315911/git-for-beginners-the-definitive-practical-guide/5968622#5968622
Didn’t understand something? StackOverflow has the answer.
https://git-scm.com/docs
The official documentation of all the git commands.
http://rogerdudler.github.io/git-guide/files/git_cheat_sheet.pdf
A cheat sheet for the most used git commands.
http://nvie.com/img/git-model@2x.png
The original image of the git-flow model
