Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Documentation of commit style in PRs #898

Open
esheppa opened this issue Nov 26, 2022 · 0 comments
Open

Documentation of commit style in PRs #898

esheppa opened this issue Nov 26, 2022 · 0 comments

Comments

@esheppa
Copy link
Collaborator

esheppa commented Nov 26, 2022

As we are using the "Rebase and Merge" strategy rather than the "Squash and Merge" strategy to merge PRs, we require fixes to be done in the underlying commits rather than in new commits during PR review. We should document this and have some recommendations of how to achieve this, something along the lines of usage of:

Redoing commits

  • git rebase -i HEAD~n and using edit, squash and exec
    Splitting commits
  • git reset to set up the state for subsequently using git add -i
  • git add -i and using the patch mode to stage some but not all of a given diff for a file

With the understanding that there are many ways to achieve the same result and this is just one of the possible ways

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant