A command line tool making merge to master through teamcity-merge script easier for the developer. Before using this you should set up teamcity-merge
npm install -g tcmerge
> tcmerge "My awesome feature is done, it solves all kinds of problems"
In order for this to work, you have to be in a git repo. The branch you are currently on has to be an open pull request on github. And you have to have pushed your commits to the pull request branch on github.
tcmerge
$ git checkout master
$ git pull
$ git checkout -b merge-external-pull-request
Copy the commit id from the pull request in GitHub.
$ git cherry-pick -x {commit id}
Repeat as necessary.
$ git push --set-upstream origin merge-external-pull-request
$ hub pull-request -m "merge external pull request"
$ tcmerge "merge-external-pull-request Fixes #[EXTERNAL_PULL_REQUEST_NUMBER]"
That way the external PR will be closed when merge to master happens, and that merge commit will be linked to the external PR.
This module also contains the command prod
Requires HUB
brew install hub
You are on master branch with uncommitted changes you want to deploy to production
> prod "hotfix that is ready to go straight to production"
commitThis module also contains the command commit
Requires HUB
brew install hub
You are on master branch with uncommitted changes you want to turn into a pull request
> commit "code changes that are ready to be made into a pull request"