It is highly recommend that you merge your changes back into ABLATE often. This is done using a Pull Request, which asks the team to review and “pull” your changes back into ABLATE from your fork/branch.

  1. Start on your feature branch outlined in Working with Git with any changes that you would like to share.
  2. Update any documentation within the docs folder.
  3. Update and create any needed tests. The GoogleTest framework is used to control and monitor tests.
  4. Make sure that all code meets formatting requirements
     # To run a format check from build directory
     make format-check
    
  5. Update the ABLATE version in the CMakeLists.txt file in the root of the project following semantic versioning.
  6. Follow the Working with Git steps to commit and push any additional changes.
  7. Navigate to your fork of ABLATE on GitHub.com.
  8. If presented with the button to “Compare & pull request” you can select this. Otherwise, select the “Pull requests” tab and select the “New pull request” button. github start pr
  9. Configure and create your pull request
    1. Check the source and destination repositories. The source repository should be your feature branch on your fork. The destination repository should be UBCHREST/ablate main.
    2. Add a title and detailed description. Within the description you should link/close any related issues.
    3. Assign any reviewer that you would like to review the pr.
    4. Create the pull request github configuring pr issue
  10. Verify the PR results to make sure all the tests have passed and the documentation is complete.
  11. Squash and Merge your pull request once all of the tests have run/pass and your code changes are reviewed. If the tests fail or if changes are requested you can simply make changes to your local branch and push. The PR will be automatically updated and the tests re-run.
  12. Once your code changes have been merged, you will want to update your fork.