Random nit: If I have merge conflicts on my branch...
# random
a
Random nit: If I have merge conflicts on my branch, both GitHub and Gitlab will allow me to "resolve conflicts" in the web GUI. But neither GitHub or GitLab will let proactively merge
main
into my branch when there aren't merge conflicts to resolve. Am I missing an option somewhere? 🤔 Seems like this option should just always be available. Both are smart enough to tell me I'm "32 commits behind main" but they don't offer a button to resolve that unless my branch has conflicts.