Releases Deployment and Git Stuff

Process

Development

• git checkout development
• CODE AWAY...
• Ready to commit feature?
• Ensure AndroidManifest.xml has updated version number (this needs scripting)
• git add --all
• git commit (add feature/change list)
• git push (push to development branch)

Release

• Switch to branch develop -> create pull request
• Merge pull request
• Once successful (tag release)
• git checkout master
• git tag -a V? -m"Tagging version ?"
• git push --tags

Update master locally

• git checkout master
• git fetch
• git pull

Post release

• git checkout development
• Increment AndroidManifest.xml
• git commit -am"Updating AndroidManifest.xml to 1.3"
• git push
• Update application properties so updates are forced ** https://github.com/jamesemorgan/ApplicationProperties/tree/master/ApplicationUpdates/WeatherSlider

---

Release and deployment process

Three Branches:

• master
• production
• development

---

Project Setup

Create branches

• git branch production
• git branch development

Push branches

• git push origin production
• git push origin development

---

Tagging release

Creating tag

• git tag -a <tag/version> -m '' e.g. git tag -a V1.0 -m"Tagging version 1.0"

Pushing tags

• git push --tags

Delete branches

• git branch -D branchname (deletes branch)
• git push origin :branchname (removes from git hub)

---

Reset to last commit

• git reset --hard HEAD