Re: How to submit PRs for dependant changes?

2020-04-26 Thread Reuven Lax
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 wrote: > > Hey Beam devs... > > I have 4 changes to submit as PRs to fix 4 independent issues in the >

How to submit PRs for dependant changes?

2020-04-26 Thread Niel Markwick
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

Re: [RESULT][VOTE] Accept the Firefly design donation as Beam Mascot - Deadline Mon April 6

2020-04-26 Thread Maximilian Michels
Hey Maria, I can testify :) Cheers, Max On 23.04.20 20:49, María Cruz wrote: > Hi everyone! > It is amazing to see how this process developed to collaboratively > create Apache Beam's mascot. Thank you to everyone who got involved!  > I would like to write a blogpost for the Beam website, and I