Git Workflow from the Beginning

Brilliant, is Git. GIT is a staging and deployment process and tool, for those working in a team simultaneously on the same project. While it is a bit daunting in the beginning, after you use it the process becomes second nature. I’m only starting, so it is appropriate for me to document my learning process, which might help others.

While git is used mostly for software development, where each team member can work on code simultaneously, it really facilitates team collaboration of any project. Two people can work on the same document, individually commit their work, and send it back to the server for someone else to approve and then merge.

Try Git: Git Tutorial has a cute tutorial to get you started. it is only 15 minutes long, longer if you take notes like I did, but was very helpful in explaining the commands. It does miss out some of the details of a complete workflow, but worthwhile to watch. Of course there is a lot more to git.

You will need to install the git tool on your specific computer with whatever operating system you choose. Research it.

Git directory Installation
git init: This sets up the git environment. Go to a directory you want git installed. You only do this once.
git config –global user.name “YOUR_USERNAME”: Add your name here, source
git config –global user.email “your_email_address@example.com”: Add email here

Commonly used Commands
git status: The most commonly used command. It will tell you the files that have changed but not added, added files, and recommend you do a commit
git branch: Shows you all your branches
git branch : create a new branch
git checkout : switch between branches

Git Document Workflow
Getting and Updating your Project
git clone: Initially you will need to do a git clone to get your project, but you only need to do this once, unless you delete your project.
git pull origin master: After your initial clone, use this to update your project from the server.

Overall Workflow

1. git branch : You make a branch of your work. This is a copy. You make changes to the copy and not the master. This way the changes can be undone in an orderly manner.
2. Edit your documents.
3. git add /: Add these files to your staging area. You can add the whole directory, just ensure you have an ending “/”
   git commit -m “Some Comment”: Commit all changes to files in the staging area. The comment will remind you of the changes, which you will see when received by the server
   git push origin : Push your branch’s staging area up to the server
   On the server, do a merge request, followed by the approval for the merge

Other commands:
git reset