-
Notifications
You must be signed in to change notification settings - Fork 145
- fixes a bug where the content type of a post request would be forcibly overridden #467
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
Conversation
|
@zengin yes, and sorry for the mess, I needed the other PR to build my unit tests |
|
@baywet, in these cases, rebasing the branch could help clear the diff. If that doesn't do the job, creating a new feature branch and cherry-picking relevant commits over can simplify the whole process. Then existing PR can be closed with a link to the new one. Doing this has two benefits:
Of course, everything has a trade-off and it may not be feasible to do that in certain situations. But I think, in general, the benefits for reviewers and everybody who looks at the history at a later time, including the author, outweigh the trouble of moving things around. My two cents. Please let me know what you think. |
e2cefa6 to
4057b68
Compare
|
@zengin makes perfect sense! I'm always hesitant to force push and/or rebase in repos where it's not a common practice. It usually confuses people. But if the team is ok with that I'll use it as common practice. |
|
@baywet I agree that force pushes shouldn't be common practice, especially on the main branches. But throw-away feature branches should be OK to be rebased. I see no downside to rebasing if the PR hasn't been created yet or reviews hasn't started. The latter one is hard to check because once the PR is created, the review may get started without any indication in the Github interface :) |
Fixes #357
Warning: this pull request contains #463 to ease up the writing of the unit test. 463 should be reviewed and merged first.
Changes proposed in this pull request
Other links