On Wed, Apr 11, 2018 at 10:07:01AM +0200, Paul Gevers wrote: > Hi all, > > Thanks for the reviews. > > I think we all agree. I believe my proposal below summarizes the discussion: > > We aim to do the following: > - No force-pushing on the master branch > - Alterations on topic branches and re-basing of topic branches on the > master branch are recommended to improve the quality of the commits > via reviews that get merged or applied in the master branch > - Preferably push topic branches to your personal repository, and create > merge requests from there for review (i.e. don't clutter the main > repository with your work branches) > - Preferably topic branches are rebased on top of master before applying > on the master branch in a fast-forward manner to contain linear > history. Merged is allowed when rebasing isn't straight forward. based on a recent discussion between me and Paul on IRC, one point was left unclear at least to me: whether or not to accept merge requests with an explicit merge commit or not. IMO the merge commit registers explicitly who merged that mr, and when that was done, so i think it's useful. it is also what the gitlab ui does when you click "merge". and clicking "merge" is way easier than pulling the branch locally, rebasing it on master, pushing, and closing the merge request by hand.
Attachment:
signature.asc
Description: PGP signature