Skip to content

Latest commit

 

History

History
90 lines (53 loc) · 2.32 KB

CONTRIBUTING.rst

File metadata and controls

90 lines (53 loc) · 2.32 KB
Raw

Contributing to Crate Active Record Adapter

Thanks for considering contributing to crate active record adapter.

Reporting an issue

  • Search existing issues before raising a new one.
  • include as much details as possible. This might include:
    • Which OS you're using.
    • Which version you've been running.
    • Logs/Stacktrace of the error that occurred.
    • Steps to reproduce.

Pull requests

Before we can accept any pull requests to CRATE Active Record Adapter we need you to agree to our CLA. Once that is done, we suggest to continue as follows:

  • Add an issue on Github and let us know that you're working on something.
  • Use a feature branch, not main.
  • Rebase your feature branch onto origin/main before raising the PR
  • Be descriptive in your PR and commit messages. What is it for, why is it needed, etc.
  • Squash related commits

Rebase

If while you've been working in the feature branch new commits were added to the main branch please don't merge them but use rebase:

git fetch origin
git rebase origin/main

This will apply all commits on your feature branch on top of the main branch. Any conflicts can be resolved just the same as if git merge was used. After the conflict has been resolved use git rebase --continue to continue the rebase process.

Squash

Minor commits that only fix typos or rename variables that are related to a bigger change should be squashed into that commit.

This can be done using git rebase -i ( <hash> | <branch> )

For example while working on a feature branch you'd use:

git add .
git commit -m "implemented feature XY"

# push and ask for a merge/review

git add .
git commit --fixup $(git rev-parse HEAD)

# push and ask for a merge/review

git add .
git commit --fixup $(git rev-parse HEAD)

git rebase -i origin/main

git commit --fixup will mark the commit as a fixup relating to the commit HEAD currently points to.

This is useful because git rebase -i will then automatically recognize the fixup commits and mark them to squash. But in order for that to work the autosquash setting has to be enabled in the .gitconfig:

git config --global rebase.autosquash true