>>>> Well, there's a good reason that gitlab has a big, fat 'rebase'
>>>> button...
>>
>> Not sure about the meaning of your message: this button shows up
>> because we enabled it as a project-wide setting. To my knowledge,
>> the default and most common strategy is merging.
Exactly! It's our policy to prefer rebasing over merging.
>> [...] rebasing now means less error-prone work in the future.
>
> That sounds reasonable.
Yes.
> However, it means everybody should expect commits to change after
> having looked at rhem. So: always pull again (well, that's clear)
> and never add commits to Owen's branch wirhout clarifying the state
> directly with him.
Agreed. Right now, it's Owen's private branch, and nobody should ever
do that.
Werner
