Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Gitlab Branch Workflow

  1. Clone the project
  2. edit, git add, commit
    Write you change (remember to include `-s` to sign off commits: `git
    commit -s`)
  3. git push
  4. Click the link from the message to open a merge request to the
    upstream repository
  5. If you have multiple commits, write a detailed explanation about what you're asking to be merged in.
    Set the change to "Draft" if its still being worked on.
  6. Wait for CI to pass and a CODEOWNER to review.
    If the project is utilizing hardware for their CI, a developer will need to approve your pipeline to run before it is tested.

Gitlab Fork Workflow

  1. Fork the project
  2. Setup mirroring
    Alternatively manage this yourself by adding an extra 'upstream'
    remote and routinely 'git pull upstream/master','git push origin master'
  3. Clone your fork
  4. Checkout a new branch to make your change
  5. edit, git add, git commit -s
    Write you change (remember to include `-s` to sign off commits: `git
    commit -s`)
  6. git push
  7. Click the link from the message to open a merge request to the
    upstream repository
    Make sure the source branch comes from your fork and the target is the upstream repository
  8. If you have multiple commits, write a detailed explanation about what you're asking to be merged in.
    Set the change to "Draft" if its still being worked on.
  9. Wait for CI to pass and a CODEOWNER to review.
    If the project is utilizing hardware for their CI, a developer will need to approve your pipeline to run before it is tested.

...