Skip to content

3. Hints for Git

Jump to bottom
krtonga edited this page Dec 6, 2018 · 9 revisions

Get the latest from the cloud

git pull

See my uncommitted changes

git status

Save my changes locally 

git commit -am "INSERT YOUR MESSAGE HERE TO TELL THE TEAM WHAT THIS COMMIT DOES"

Note: the above command is shorthand for:

git commit add .
git commit -m "INSERT YOUR MESSAGE HERE TO TELL THE TEAM WHAT THIS COMMIT DOES"

Save and share my changes with remote 

git commit -am "INSERT YOUR MESSAGE HERE TO TELL THE TEAM WHAT THIS COMMIT DOES"
git pull
 -> if there are merge conflicts, resolve the conflicts, then run:
    git commit -am "Resolved Merge Conflicts"
     -> pull will proceed, and should succeed
git push

Get the latest from android-311

Note: this is for when there have been updates to the core repo. If the MajiFix team has helped you set up your repo, this might not ever be necessary.

git remote add upstream https://github.com/CodeTanzania/open311-android.git
git pull upstream master

Clone this wiki locally