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

Module 2. Change requests and squashing #12

Open
OleksiyRudenko opened this issue Jun 21, 2019 · 0 comments
Open

Module 2. Change requests and squashing #12

OleksiyRudenko opened this issue Jun 21, 2019 · 0 comments

Comments

@OleksiyRudenko
Copy link
Collaborator

OleksiyRudenko commented Jun 21, 2019

Draft

Theory: how to create a feature branch to avoid problems at PR phase and how to fix if you face this issue nevertheless

  1. Author adds some code into two individual files in 4 commits, committing into a feature branch
    (commit to file A, commit to file B, commit to file A again, commit to file B again)
  2. Author regroups and squashes commits per each file
  3. Author pushes changes upstream
  4. Code reviewer requests changes
  5. Author implements changes locally
  6. Code reviewer requests a change with a suggestion
  7. Author accepts suggestion on GitHub
  8. Code reviewer approves PR
  9. Code reviewer squash-rebases PR commits onto dev
  10. Repo maintainer merges changes from dev into master and tags a release
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