Hi nml,
Glad you got GIT working.
A few things we need to cover:
- Why GIT and not Tortoise, well, I wondered that myself and found this explanation:
"SVN is one repo and lots of clients. GIT is a repo with lots of client repos, each with a user. It’s decentralised to a point where people can track their own edits locally without having to push things to an external server.
SVN is designed to be more central where GIT is based on each user having their own GIT repo and those repos push changes back up into a central one. For that reason, GIT gives individuals better local version control."
- For a more visual interface you can type “gitk” in the terminal. I use this but very seldom. My approach to GIT is this: for every feature in my project I create a GIT feature, commit during development of the feature, then when complete I close the feature. I hardly ever worry or think about it until something goes wrong then GIT to the rescue.
Every step of the way I have a working version of my code. If I do need to check something then I use gitk. Once you have the commands down, it becomes natural and easy.
To make it easier for myself, I have created aliases (shortcuts) for the git and gitflow commands I use. I also use “oh my zsh” which allows me to customize my shell and it has many aliases to common git commands.
So if I want to start a feature I simply type “gffs” followed by the feature name and it’s done.
Nowadays I use a Ruby Gem to automatically grab the latest feature/chore/bug from Pivotal tracker and create a gitflow feature for me.
Automation is a beautiful thing - trust me.
It seems every time I reply I open another can of worms 
Remember, you do not have to learn it all at once and if you find yourself repeating things then you should immediately think AUTOMATION.
- Pivotal Tracker is FREE for 60 days. After that period your account will be set to a FREE account which means you can have 5 personal projects and only 1 collaborator. Any amount of members can view your project. I’ve found this sufficient for my purposes. So go ahead and try it.
I know this all sounds geeky and coming from a design background, I was reluctant to implement these things. But I can honestly say today that I have no idea how I have managed without it.
Let me know if I can help you to set up aliases for git and gitflow. This will make it a little easier.
Soon you’ll be using it without noticing it, like changing gears in the car.
[import]uid: 78073 topic_id: 20337 reply_id: 86578[/import]