It monitors many short-lived, task branches. Setting the branch status to resolved
triggers Trunkbot to poll issue trackers for permission to launch builds, run tests and CI.
It will then notify the success or failure of the merges and updates the appropriate status
in Slack, issue trackers... when completed. Let Trunkbot move your code from done to shipped
to production automatically!
In the eventuality that the Merge Machine in the Plastic SCM server is unable to merge branches, Conflictsbot will immediately notify the users. Conflictsbot tracks all branches in a repo: when conditions are met, it will run dry-merges of them with main. If it requires manual intervention it will notify and change the branch status for you. Otherwise it's queued to be merged and shipped with Trunkbot!
1Integrate with your issue tracker.
2Move branches from resolved to reviewed to validated and trigger your CI system.
3Test task branches after merge, but only confirm the merge if tests pass... Never break a build again.
