- About Scala
- In the Enterprise
- Scala Community
- Language Research
- In the Press
- The Scala Team
- Scala's Prehistory
- Contact Us
- Learning Scala
- Tour of Scala
- Scala API
- Setup & Getting Started
- Programming Guides
- Other Guides
- Code Examples
- Scala Developers
Workflow for failed pull requests
I'm wondering what's the suggested workflow for failed pull requests.
Simply adding another commit to the branch in question is probably not
an option because the pull requests are supposed to be in a state that
allows merging into trunk without further squashing or rewriting.
So, rewrite the branch in the pull request? That's what I just did. I
also had to rewrite another pull request with a follow-up patch. I then
notified Paul about the changes so he could retry integrating them. But
rewriting public branches is ugly, plus I'm wondering if this would this
work with an automated system.
Or delete the public branch and pull request, rewrite the local one, and
publish it again? Is this any better? The branch name would still be the
same but that's what we want if fixes for tickets should come in
branches named e.g. issue/1234, right?
I'm used to much simpler git workflows, so maybe one of the git experts