Skip to content

Pull requests

Bazyli Polednia edited this page Mar 8, 2021 · 1 revision

When you decide your change is ready to be merged to main branch, create a pull request. Currently, your request requires at least one approval from code reviewers to be able to be merged - you will not be possible to merge it automatically.

Good practices

  • Make sure to squash your commits before creating pull requests. This way it reduces the number of them merged to main branch as well as makes the pull request itself cleaner.
  • Remove all unnecessary code before creating the pull request. This includes e.g. commented-out code, that you left during debugging.
  • Attach your pull request to appropriate Trello card.
  • If your pull request is not ready for merging yet, start its name with "WIP: "

Code review

During code reviewing other peoples' code, try to find pieces of code that are not obvious. You should be able to understand the code just by looking at it, not by reaching out to the author. After your code has been commented and you decided that it requires corrections, use git rebase to implement them. Don't create new commit with fixes!. If you have never used git rebase, I suggest you take a look at this tutorial. The most important thing is to use git push origin <branch> --force-with-lease when pushing fixes, so that pull request's history does not get messed up.

Clone this wiki locally