You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

39 lines
1.2 KiB

  1. The following steps should be performed to integrate pull requests from Github.
  2. 0. After a pull request is opened, some automatic build checks should be performed by Github Actions.
  3. Failures of these checks should be fixed.
  4. 1. Manually review the pull request on Github and suggest improvements if necessary.
  5. In particular make sure:
  6. * No unnecessary files were committed (for example build artefacts, etc.)
  7. * No remains from the development are present (for example debug output, hackish workarounds, etc.)
  8. * ...
  9. 2. Integrate the pull request via Github, preferably by *rebase and merge*.
  10. 3. Optional (if not done already): add the Github repository as another remote for your local copy of the internal repository:
  11. ```console
  12. git remote add github https://github.com/moves-rwth/storm.git
  13. ```
  14. 4. Fetch the current Github master:
  15. ```console
  16. git fetch github
  17. ```
  18. 5. Make sure to be on the (internal) master:
  19. ```console
  20. git checkout master
  21. ```
  22. 6. Rebase the changes of Github onto the (internal) master:
  23. ```console
  24. git rebase github/master
  25. ```
  26. 7. Check that Storm builds successfully and everything works as expected.
  27. 8. Push the changes into the internal repository:
  28. ```console
  29. git push origin
  30. ```