Git Rebase got you conflicted? Here's what you can do.
Let's say you're working with feature branches. I know Trunk based development is the way to go, but...
Tags: github, git, versioncontrol