Before you can start using git you need to generate an ssh key and add the public part of the key to your Github and Bitbucket accounts. That way you can interact with private repositories without entering your username and password all the time. Just remember to clone the repository using SSH clone url.
There are two main branches,
master branch contains only published code at all times and each release is tagged with the version number.
dev branch serves for integration of various features/fixes developed in separate branches.
Before releasing the app on PlayStore the release has to be tagged with the version number. Also, provide a short description for the release. Example of adding a tag:
git tag -a 3.0.0 -m “The best version ever“ git push --tags
You can find more info about tagging here.
The development branch should always be named
dev, for consistency across projects.
Branches are named according to their use and words are delimited by dashes. Some examples:
feature/login-screen enhancement/ui-improvements fix/533-pin-user-alert
Starting work on a new feature
git checkout dev git checkout -b feature/login-screen
Merging the feature into
The preferred way of merging a branch back into
dev is by creating a pull request and assigning it to a colleague for review.
There are two different roles on every pull request. The assignee and the reviewer. Reviewers are your colleagues who are reviewing your pull request, whereas the assignee is the person responsible for merging or cancelling the pull request, in other words, you.
If the branch cannot be merged back into
dev because of a merge conflict, you need to fix the conflict on your feature branch by either rebasing from
git checkout feature/login-screen git rebase dev
or by merging
dev into your branch
git checkout feature/login-screen git merge dev
Commit early, commit often
Don't forget to commit and push your code to the remote repository, this will insure you against losing your hard work. Make small commits with meaningful commit messages and push at least once a day.
Don't commit generated code
Generated code does not belong in the repo, to exclude it use the .gitginore file. This file can be generated using gitignore.io tool. All you need to do is write a few keywords (such as: MacOS, Android, IntellJ, Android Studio) and the tool will generate the file content for you.
Don't commit chunks of commented out code
Don't comment out code and commit it to the repository so you can 'uncomment it if you ever need it again'. This creates mess in the code and makes it less readable. It's easy to return to an earlier commit and look up the code which you removed so there is no need to leave commented code lying around everywhere.
Resolving merge conflicts
Android Studio has a great built-in tool for resolving merge conflicts.
You can find it in
VCS Operations Popup.
Before you can use this tool, select Git as your VCS for your project under
You can find more details about the tool here.
For a quick overview of your commit messages for today and yesterday you can use the following aliases:
alias today='git log --since=6am --format="* %s" --author="$(git config user.email)" --reverse -- | pbcopy' alias yesterday='git log --since=yesterday.6am --until=6am --format="* %s" --author="$(git config user.email)" --reverse -- | pbcopy'