[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: RFR: CI-team GIT repository way-of-working



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.

Paul

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: