... | ... | @@ -50,7 +50,7 @@ cd stork |
|
|
|
|
|
- Stork project is currently set up in a way that allows only fast-forward merges. This is not the only possible option, but it works well for other projects (Kea, ISC DHCP) and it looks like the right way to go. It keeps the repo history much cleaner. If you complain about tons of merge conflicts, you tried to push a ticket that was too big.
|
|
|
|
|
|
- Before merging, please run unit-tests and linters on your own (useful commands: `rake unittest_backend` and `rake lint_go fix=true`, also `rake lint_ui`)
|
|
|
- Before merging, please run unit-tests and linters on your own (useful commands: `rake unittest:backend` and `FIX=true rake lint:backend`, also `rake lint:ui`)
|
|
|
|
|
|
- Using rebase button on the MR page is a very nice way of rebasing your branch. If there are conflicts, here's how you can rebase the code manually:
|
|
|
```console
|
... | ... | |