To clone a repo, use

git clone [email protected]:<user>/<repo>

Make sure you're on stage, which is our default base for new features

git checkout origin stage

Create a new branch for the new feature. Use lowercase and underscore for spaces

git checkout -b feat-cool-feature

Make some changes, and stage them

git add -A
git commit -m "feat: add cool feature a"

If you've only made changes to existing files, adding and commiting can be done with a single command

git commit -am "feat: add cool feature b"

Commit your changes using a commit message on the following format

• conf - commit contains only configuration updates
• feat - commit adds new functionality
• fix - commit fixes a bug
• ref - commit contains a refactor of existing code, no new functionality

Use imperative form in commit messages. That is, write what you intended to do, not what you did: "add new feature", not "added new feature"

NB: If you feel like your commit fits several of these tags, that probably means you're commiting too much at once. A single commit should only cover a single feature! If you did some refactoring, and updated some configurations, then create two separate commits: One for each. Also, if you feel like your commit message requires the word and, that probably is a sign that you're commiting too much!

Perhaps the most scary part of using git is the fear of losing work and resolving merge conflicts. However, these issues can mostly be avoided by using a swift workflow.

Add a feature

git branch -b feature_c
echo some changes >> feature_c.txt
git add -A
git commit -am "feat: add neat feature c

Update your local repo, and merge it into your new feature branch

git checkout stage
git pull origin stage
git checkout feat-cool-feature
git merge stage

Make sure everything still works, and then create a Pull Request through GitHub or SourceTree.

NB: If you're familiar with Rebase, consider rebasing your branch on top of stage before merging the feature in. This will remove unecessary commits, and clean up the history.

git fetch -a
git rebase -i origin/stage
git push -f <your branch>

• What is origin? Origin is the remote repository. On the other hand, HEAD is the current state of local repo on your own computer.