Re: Pilot GitLab program

[Carlos Soriano <csoriano gnome org>]

Hey Michael,

Indeed, unfortunately the current production instance continues withouth ff merge support (UI wise, UI hooks and feedback, etc.), and that will require more discussion with the GitLab team.

In general, merges vs ff, I would leave that as a maintainer decision, but as you mention most would like linear history and we could take a look for a hook on the server side for now for individual projects to avoid the GitLab UI to be missused.

For Nautilus, we will see how much that makes sense or not. For now we will keep linear history, since I see no reason so far to change it.

Best,

Carlos Soriano

On Tue, Jun 27, 2017 at 3:08 PM, Michael Catanzaro <mike catanzaro gmail com> wrote:

On Tue, Jun 27, 2017 at 3:54 AM, Carlos Soriano <csoriano gnome org> wrote:

Expect Nautilus and librsvg (with Federico) to move to the pilot program this week.

Cool. I would just suggest making sure that your interns are careful not to push a non-ff merge (i.e. not to use merge requests), since that will confuse nautilus's git history until the end of time. A server hook to block this would be useful, since I expect the number of projects that want linear history is much higher than the number of projects that want to allow merge commits.

Michael