(a) or (c) should work. (c) is preferred if you want faster reviews. For multiple JIRAs, I've seen both [BEAM-123,BEAM-456] and [BEAM-123][BEAM-456] formats. One of them works but I'm not sure which. :D You can always manually add a PR to a JIRA.
On Sun, Apr 26, 2020 at 2:49 PM Reuven Lax <[email protected]> wrote: > For c), I don't think you need merge resolutions. You can submit each > commit in a separate PR, and rebase your branch after each one. > > On Sun, Apr 26, 2020 at 10:25 AM Niel Markwick <[email protected]> wrote: > >> >> Hey Beam devs... >> >> I have 4 changes to submit as PRs to fix 4 independent issues in the >> io.gcp.SpannerIO class. >> >> The PRs are notionally independent, but will cause merge conflicts if >> submitted separately, as the fix for each issue will change code related to >> the fix for some of the others. >> >> How do you prefer the PRs to be submitted? >> >> a) one single PR with 4 sequential commits within it >> b) one single PR with all changes squashed. >> c) 4 separate conflicting PRs which will have to be merged separately, >> and a merge conflict resolution after each one. >> >> a) is how it is in my repo. >> b) would be easy, but less clear what the changes were for. >> c) I guess would be clearest in the Beam changelog. >> >> If the answer is a) or b), how would I specify multiple JIRA tickets in >> the PR title? >> >> Thanks! >> >> -- >> <https://cloud.google.com> >> * • **Niel Markwick* >> * • *Cloud Solutions Architect <https://cloud.google.com/docs/tutorials> >> * • *Google Belgium >> * • *[email protected] >> * • *+32 2 894 6771 >> >> >> Google Belgium NV/SA, Steenweg op Etterbeek 180, 1040 Brussel, Belgie. RPR: >> 0878.065.378 >> >> If you have received this communication by mistake, please don't forward >> it to anyone else (it may contain confidential or privileged information), >> please erase all copies of it, including all attachments, and please let >> the sender know it went to the wrong person. Thanks >> >
smime.p7s
Description: S/MIME Cryptographic Signature
