How did you guys resolve merge or test conflicts? Did you just have to rebase, u...

		mattmatheson 7 months ago \| parent \| context \| favorite \| on: The origin story of merge queues How did you guys resolve merge or test conflicts? Did you just have to rebase, update your PR, and resubmit?