Created
May 24, 2017 13:46
-
-
Save marcelocarmona/e166d71093c95507fb72005a4cf94f95 to your computer and use it in GitHub Desktop.
Basic Workflow
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Example flow, working on feature X, current branch is master | |
# This is not the only way to do it. The most important thing is that you want to keep linear history on the master branch. | |
# Create a local topic branch for all work | |
git checkout -b /topic/{username}/feature-x | |
# Make changes, test, then commit changes to topic branch | |
git commit | |
# Make sure master is at latest | |
git checkout master | |
git pull -r | |
# Move your changes from the feature branch onto master maintaining linear history | |
git checkout /topic/{username}/feature-x | |
git rebase master | |
git checkout master | |
git merge /topic/{username}/feature-x | |
# You should see a message saying "Fast-forward", which means your feature commits were played on top of master, not merged | |
# Building a sandbox and | |
gobuild sandbox queue vcd_ui --changeset #commit_hash --user psimhadri --email email_id --buildtype beta --store-tree | |
# Refer to the development flow section below for posting a review | |
# Set the template to use for commits. | |
git config commit.template .gitmessage | |
# Push commit to remote master | |
git push |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment