Skip to main content

Create Pull Requests

Create a local branch​

  1. First, create a new branch for the task or feature you are working on. You can do this by typing the following command in your terminal:
git checkout -b [branch-name]
  1. Replace [branch-name] with the name of your new branch, which should be named according to the task or feature you are working on. Make sure to check the branch name on Linear.app before creating it to ensure consistency.

Drag Racing

  1. Before committing changes, users need to run Husky's pre-commit Git hook to ensure code quality. This hook includes running code standards, linting, and tests.

Create a pull request​

  1. Push your branch to GitHub using the command:
git push origin [branch-name]`
  1. Go to the repository in GitHub and click on the "Pull requests" tab.
  2. Click on the "New pull request" button.
  3. Select the base branch as main or master and the compare branch as your feature branch.
  4. Review the changes and add a description if necessary.
  5. Click on the "Create pull request" button.

Review and merge the pull request:​

  1. Wait for the team to review and approve the pull request.
  2. Once approved, click on the "Merge pull request" button.
  3. Choose the option to delete the branch after merging.

Deploy changes to preview and sandbox:​

  1. GitHub will automatically deploy changes to preview and sandbox environments.
  2. Preview and sandbox environments will use their own databases.
  3. Sandbox database will be reset on each deployment.

Promote preview to production:​

  1. Urgent hot-fixes: will be reviewed and accepted immediately if all CD/CI passes.
  2. High priority tasks: will be released in a daily basis.
  3. Normal priority tasks: will be released in a weekly basis.
  4. Major changes, platforms updates and issues with potential breaking changes must be approved and planned before deployments.

Resources​

  • Git Handbook: A comprehensive guide by GitHub on using Git for version control.
  • Git Basics by FreeCodeCamp: A beginner-friendly tutorial covering the basics of Git commands and workflows.
  • Pro Git: A free, open-source book that covers everything you need to know about Git, from the basics to advanced workflows.
  • Git Cheat Sheet by GitHub Education: A handy cheat sheet with Git commands and explanations.