Skip to content
alexjo edited this page Aug 11, 2014 · 6 revisions
  • Fork this repo
  • Clone your fork of this repo => git clone [email protected]:$YOUR_USER_NAME/android-test.git
  • Create and checkout a new branch for feature work => git branch lib_updates && git checkout lib_updates
  • Do work and change/create code as required
  • Save branch => git add --all && git commit -m "working on new features"
  • Upload branch => git push origin lib_updates:lib_updates
  • Create pull request with git web gui
  • Change local branch to either master or another feature branch => git checkout master

Do not do any further work on the branch currently in Pull Request for review

###If pull request was successfully merged

  • (Optional) Destroy feature branch => git branch -d lib_updates && git push origin :lib_updates
  • Confirm you are on your master branch => git checkout master
  • Add remote for upstream => git remote add upstream [email protected]:TEST/android-test.git
  • Merge upstream changes into master => git merge upstream/master
    • resolve any conflicts and commit those into your local master repo.

###If changes need to be made

  • Switch to your feature branch => git checkout lib_updates
  • Make changes and follow previous steps for upload into remote branch
Clone this wiki locally