Keeping Local Repo Up to Date

In order to keep up to date with any new commits on master and, especially, devel/android, I suggest adding the main BBCT repo as a remote to your local repo. You do this with

$ git remote add bbct https://github.com/BaseballCardTracker/bbct.git

Now whenever anyone commits to a branch on the main repo you can update your local and GitHub repos. For example

$ git checkout devel/android
$ git pull bbct devel/android
$ git push origin devel/android

Next, you should rebase your current work on top of the new devel/android branch:

$ git checkout mybranch
$ git rebase devel/android

During the rebase, you may encounter conflicts. You should make the necessary corrections, add the files to the index, then continue the rebase:

# After resolving conflicts
$ git add .
$ git rebase --continue