Add alternative way to resolve merge conflicts - #34
Open
saschastahl wants to merge 1 commit into
Open
Enhance your code review process with GitHub Actions
GitHub Actions make it easy to automate all your software workflows, now with world-class CI/CD.
Build, test, and deploy your code right from GitHub. Learn more about GitHub Actions.
Linux, macOS, Windows, and containers
Matrix builds
Any language
Live logs
Built-in secret store
