We will be attempting a work flow in github where every ticket is a branch off of master.
After the ticket is complete, the work is merged into staging where regression and integration tests are performed before it is merged into master.
A team lead brought up the issue of the old ticket branches after a merge will start to build up.
I found this script and want to know if this would work in our environment. We only want to delete branches that have been merged into master.
Github has released a feature where anyone with admin permission to the repository can configure branches to get deleted automatically after pull requests are merged. Here are the steps -
This feature has been released by Github on July 31, 2019.
There's no ready-to-use script for your use case as far as I know. You'll have to create your own tools for that.
There is a tool called git-flow by Vincent Driessen which was built to assist developers following his git workflow described in "A successful Git branching model" .
It's is not as easy as just deleting the branch after merge because you never know if you'll run into a merge conflict or not.
Add either of the following to your .gitconfig
file for an easy alias to merge and delete a branch with 1 command.
Alias as a function:
[alias]
ff = "!f() { git merge $1; git branch -d $1; }; f"
Alias as a new shell command:
[alias]
ff = !sh -c 'git merge $1 && git branch -d $1' --
They both do the exact same thing, just 2 different methods of doing it.
There is an option in Github UI where repository administrator can configure.
Under "Merge button", select or unselect Automatically delete head branches.
As far as I know, the best option currently is a GitHub app called delete-merged-branch . It can be easily integrated into a selected repository as an existing app installation, but its source code is also available . This app will automatically delete branches after they have been merged through a PR.
After pull requests are merged, you can have head branches deleted automatically in GitHub :
repository -> settings -> (general) pull requests -> check Automatically delete head branches
The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.