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.

Sign up for GitHub

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

Jump to bottom

Update "Keeping your fork in sync" instructions in dev workflow doc to favor rebase #21

Open
lukpueh opened this issue Oct 9, 2020 · 0 comments
Open

Update "Keeping your fork in sync" instructions in dev workflow doc to favor rebase #21

lukpueh opened this issue Oct 9, 2020 · 0 comments

Comments

@lukpueh
Copy link
Member

lukpueh commented Oct 9, 2020

The "Submit a pull request." section of our dev workflow doc points to GitHub docs that explain how to keep your fork in sync. It looks like GitHub updated their instruction to use merge instead of rebase, which conflicts with our recommendation in our git history guidelines, which strongly favor rebase.

Possible Solutions:

  1. Remove link to GitHub doc
  2. Replace it with a link to instructions that favor rebase
  3. Add a note to follow the instructions only until before the merge and to then use rebase instead of merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@lukpueh