Re: GitHub Merging

2022-04-18 Thread Jongyoul Lee
> BTW, we also need to update the jira ticket if using github merge Ah ... I should keep it in mind. :-) 2022년 4월 7일 (목) 오후 4:15, Philipp Dallig 님이 작성: > Thanks, I will try this out. > > Am 07.04.22 um 04:28 schrieb Jeff Zhang: > > Jongyoul's right, I think both approaches work. BTW, we also nee

Re: GitHub Merging

2022-04-07 Thread Philipp Dallig
Thanks, I will try this out. Am 07.04.22 um 04:28 schrieb Jeff Zhang: Jongyoul's right, I think both approaches work. BTW, we also need to update the jira ticket if using github merge On Wed, Apr 6, 2022 at 12:47 PM Jongyoul Lee wrote: Yeap. I just merged it with Github's "Squash an

Re: GitHub Merging

2022-04-06 Thread Jeff Zhang
Jongyoul's right, I think both approaches work. BTW, we also need to update the jira ticket if using github merge On Wed, Apr 6, 2022 at 12:47 PM Jongyoul Lee wrote: > Yeap. > > I just merged it with Github's "Squash and Merge" button. I also wonder > which is better but I feel like both are ok

Re: GitHub Merging

2022-04-05 Thread Jongyoul Lee
Yeap. I just merged it with Github's "Squash and Merge" button. I also wonder which is better but I feel like both are ok but the disadvantage of Github button is that we couldn't cherry-pick to another branch automatically. I talked to Jeff about the same issue and we concluded both would be ok.

GitHub Merging

2022-03-31 Thread Philipp Dallig
Hi Jeff and Jongyoul, it seems that you have changed the way of merging pull requests into the Zeppelin master branch. The following pull request (https://github.com/apache/zeppelin/pull/4332) looks great in GitHub (marked as merged) and in the commit histroy (https://github.com/apache/zeppe