Created
December 1, 2016 19:54
-
-
Save MatthewVita/6addea95c86da96e7fb14272198a9532 to your computer and use it in GitHub Desktop.
This file contains 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
git checkout develop | |
git fetch | |
git pull | |
git checkout us_123_impl_foobar_feature | |
git merge origin/develop # Creates a new commit on us_123_impl_foobar_feature, that contains all changes from develop | |
git reset --soft origin/develop # Generates a set of staged changes | |
git add -A | |
git commit -m '[US-123] Adds Foobar' | |
git checkout develop | |
git merge us_123_impl_foobar_feature | |
gulp # ensure tests and linting pass... gulp build:dev to see the dev env | |
# open app and ensure all is well | |
git diff HEAD~1 # ensure changes are expected | |
git push origin develop |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment