I’m pretty sure you know what rebase is and why you should use it. You probably use it on a daily basis. I’m gonna show you an easy way how to automate that.
First, it’s all about time and money. Well, that’s not right. It’s also about comfort, scalability, and mindset. Why you should take care of the rebase? I know it’s a simple process. But, it’s the process you repeat so much often. You don’t want to go through all your active branches and rebase all of them manually. Let’s start to rebase smartly.
All you need it’s a GitHub repository and an Atomist account. So if you have some repository, great, if no, just create a new one. Atomist account is free right now and you can log in using GitHub. You need to allow atomist access to your repository. Once your Atomist account is ready, enable Auto-Rebase Pull Requests skill. The configuration is very simple. You just need to select a repository or let the skill use all repositories and choose a merge strategy.
Well, it doesn’t rebase every branch. If you want to auto-rebase your branch, you have to open a pull request and add a label
auto-rebase:on-push. That’s it. Your branch will be rebased by Atomist skill every time something is pushed to your primary branch.
YES, it works even there are some conflicts. That’s why you selected a merge strategy in the configuration. Try it, you would love it.