Meltano

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? :thinking_face: 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.

`/rebase` slash command to the rescue in gitlab

Omg, thank you! I'll try it next time. :thumbsup:

<https://docs.gitlab.com/ee/user/project/quick_actions.html>

I use it all the time :slightly_smiling_face:

Cool!  I was going to say rebase, but didn't know there was a shortcut for it.