Skip to content
Snippets Groups Projects

Resolve "Add in Contributing.md that only compilation fixes are allowed in develop branch"

Merged Guillaume Pasero requested to merge 1550-limit-push-on-develop into develop
All threads resolved!

Closes #1550 (closed)

This is a proposition to limit the commits pushed directly on develop (restricted to COMP commits when the Dashboard is broken).

Feel free to give your opinion on this proposition. If we don't have a consensus, I will propose a different version.

Merge request reports

Merged by Guillaume PaseroGuillaume Pasero 6 years ago (Apr 16, 2018 2:33pm UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Guillaume Pasero resolved all discussions

    resolved all discussions

  • added 1 commit

    • 510509dc - DOC: alternative proposal for broken dashboard fixes

    Compare with previous version

  • I made an alternative proposal since the original one doesn't have a real consensus among OTB developers. This one should allow:

    • a review on every commit
    • quick merges when needed
  • Julien Michel
  • reopened

  • Guillaume Pasero resolved all discussions

    resolved all discussions

  • added 1 commit

    • 65a8d9f2 - DOC: simplify a bit the rules for merge requests

    Compare with previous version

  • Is this 3rd iteration okay with everybody?

  • added 1 commit

    • b6583597 - Add description and link of the dashboard

    Compare with previous version

  • added 1 commit

    Compare with previous version

  • I made a minor edit to describe what is the dashboard which was not introduce before in the document.

  • Rashad Kanavath
  • Rashad Kanavath resolved all discussions

    resolved all discussions

  • Also note that I do not think that we are going to protect the develop branch from pushes.

    So if one day, you are the last survivor of otb developers, and you need to fix a broken dashboard in a day so as to prevent total anihilation of the known world, you will still be able to do it ;)

    Just remember that it is not something we should do in our normal workflow.

  • So if we all agree, I propose we merge this branch without dashboard testing!

  • mentioned in commit 01181350

  • Please register or sign in to reply
    Loading