You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ambari.apache.org by Nate Cole <nc...@hortonworks.com> on 2018/01/18 15:02:50 UTC
Feature Branch Merging and PR
What is the expected workflow when I need to merge from trunk to a feature branch to keep it up to date.
- Do I use my own fork to merge trunk to feature, then create a PR?
- Can I merge directly and push?
- Other option?
Thanks,
Nate
RE: Feature Branch Merging and PR
Posted by Dmytro Grinenko <dg...@hortonworks.com>.
I can guess - by direct commit without PR. Question is - where repo is hosted: github or gitbox, then you can push the changes using right upstream.
-----Original Message-----
From: Jonathan Hurley [mailto:jhurley@hortonworks.com]
Sent: Thursday, January 18, 2018 8:19 PM
To: dev@ambari.apache.org
Subject: Re: Feature Branch Merging and PR
I don't know ... but I do see commits in the repo which don't seem to have come from a PR. How did they get in there?
> On Jan 18, 2018, at 12:33 PM, Robert Levas <rl...@hortonworks.com> wrote:
>
> If I don’t create a PR, how do I get changes from my fork back into apache/ambari?
>
>
> On 1/18/18, 12:27 PM, "Jonathan Hurley" <jh...@hortonworks.com> wrote:
>
> It's a bit odd though to create a PR every time you have to update a branch. Depending on what you're working on, it may be fast-forwards each time. To create a PR each time seems like overkill.
>
>> On Jan 18, 2018, at 10:16 AM, Robert Levas <rl...@hortonworks.com> wrote:
>>
>> I have been doing the following…. I am not sure if it is totally correct, though:
>>
>> 1. git fetch upstream
>> 2. git checkout branch-feature-AMBARI-XXXXX 3. git merge
>> upstream/trunk 4. Fix any merge issues 5. git commit -a -m "Merge
>> remote-tracking branch 'upstream/trunk' into branch-feature-AMBARI-XXXXX"
>> 6. git push
>> 7. Using GitHub.com, create a PR for apache/
>> branch-feature-AMBARI-XXXXX
>>
>> Rob
>>
>>
>> On 1/18/18, 10:02 AM, "Nate Cole" <nc...@hortonworks.com> wrote:
>>
>> What is the expected workflow when I need to merge from trunk to a feature branch to keep it up to date.
>>
>>
>> - Do I use my own fork to merge trunk to feature, then create a PR?
>>
>> - Can I merge directly and push?
>>
>> - Other option?
>>
>> Thanks,
>> Nate
>>
>>
>
>
>
Re: Feature Branch Merging and PR
Posted by Jonathan Hurley <jh...@hortonworks.com>.
I don't know ... but I do see commits in the repo which don't seem to have come from a PR. How did they get in there?
> On Jan 18, 2018, at 12:33 PM, Robert Levas <rl...@hortonworks.com> wrote:
>
> If I don’t create a PR, how do I get changes from my fork back into apache/ambari?
>
>
> On 1/18/18, 12:27 PM, "Jonathan Hurley" <jh...@hortonworks.com> wrote:
>
> It's a bit odd though to create a PR every time you have to update a branch. Depending on what you're working on, it may be fast-forwards each time. To create a PR each time seems like overkill.
>
>> On Jan 18, 2018, at 10:16 AM, Robert Levas <rl...@hortonworks.com> wrote:
>>
>> I have been doing the following…. I am not sure if it is totally correct, though:
>>
>> 1. git fetch upstream
>> 2. git checkout branch-feature-AMBARI-XXXXX
>> 3. git merge upstream/trunk
>> 4. Fix any merge issues
>> 5. git commit -a -m "Merge remote-tracking branch 'upstream/trunk' into branch-feature-AMBARI-XXXXX"
>> 6. git push
>> 7. Using GitHub.com, create a PR for apache/ branch-feature-AMBARI-XXXXX
>>
>> Rob
>>
>>
>> On 1/18/18, 10:02 AM, "Nate Cole" <nc...@hortonworks.com> wrote:
>>
>> What is the expected workflow when I need to merge from trunk to a feature branch to keep it up to date.
>>
>>
>> - Do I use my own fork to merge trunk to feature, then create a PR?
>>
>> - Can I merge directly and push?
>>
>> - Other option?
>>
>> Thanks,
>> Nate
>>
>>
>
>
>
Re: Feature Branch Merging and PR
Posted by Robert Levas <rl...@hortonworks.com>.
If I don’t create a PR, how do I get changes from my fork back into apache/ambari?
On 1/18/18, 12:27 PM, "Jonathan Hurley" <jh...@hortonworks.com> wrote:
It's a bit odd though to create a PR every time you have to update a branch. Depending on what you're working on, it may be fast-forwards each time. To create a PR each time seems like overkill.
> On Jan 18, 2018, at 10:16 AM, Robert Levas <rl...@hortonworks.com> wrote:
>
> I have been doing the following…. I am not sure if it is totally correct, though:
>
> 1. git fetch upstream
> 2. git checkout branch-feature-AMBARI-XXXXX
> 3. git merge upstream/trunk
> 4. Fix any merge issues
> 5. git commit -a -m "Merge remote-tracking branch 'upstream/trunk' into branch-feature-AMBARI-XXXXX"
> 6. git push
> 7. Using GitHub.com, create a PR for apache/ branch-feature-AMBARI-XXXXX
>
> Rob
>
>
> On 1/18/18, 10:02 AM, "Nate Cole" <nc...@hortonworks.com> wrote:
>
> What is the expected workflow when I need to merge from trunk to a feature branch to keep it up to date.
>
>
> - Do I use my own fork to merge trunk to feature, then create a PR?
>
> - Can I merge directly and push?
>
> - Other option?
>
> Thanks,
> Nate
>
>
Re: Feature Branch Merging and PR
Posted by Jonathan Hurley <jh...@hortonworks.com>.
It's a bit odd though to create a PR every time you have to update a branch. Depending on what you're working on, it may be fast-forwards each time. To create a PR each time seems like overkill.
> On Jan 18, 2018, at 10:16 AM, Robert Levas <rl...@hortonworks.com> wrote:
>
> I have been doing the following…. I am not sure if it is totally correct, though:
>
> 1. git fetch upstream
> 2. git checkout branch-feature-AMBARI-XXXXX
> 3. git merge upstream/trunk
> 4. Fix any merge issues
> 5. git commit -a -m "Merge remote-tracking branch 'upstream/trunk' into branch-feature-AMBARI-XXXXX"
> 6. git push
> 7. Using GitHub.com, create a PR for apache/ branch-feature-AMBARI-XXXXX
>
> Rob
>
>
> On 1/18/18, 10:02 AM, "Nate Cole" <nc...@hortonworks.com> wrote:
>
> What is the expected workflow when I need to merge from trunk to a feature branch to keep it up to date.
>
>
> - Do I use my own fork to merge trunk to feature, then create a PR?
>
> - Can I merge directly and push?
>
> - Other option?
>
> Thanks,
> Nate
>
>
Re: Feature Branch Merging and PR
Posted by Robert Levas <rl...@hortonworks.com>.
I have been doing the following…. I am not sure if it is totally correct, though:
1. git fetch upstream
2. git checkout branch-feature-AMBARI-XXXXX
3. git merge upstream/trunk
4. Fix any merge issues
5. git commit -a -m "Merge remote-tracking branch 'upstream/trunk' into branch-feature-AMBARI-XXXXX"
6. git push
7. Using GitHub.com, create a PR for apache/ branch-feature-AMBARI-XXXXX
Rob
On 1/18/18, 10:02 AM, "Nate Cole" <nc...@hortonworks.com> wrote:
What is the expected workflow when I need to merge from trunk to a feature branch to keep it up to date.
- Do I use my own fork to merge trunk to feature, then create a PR?
- Can I merge directly and push?
- Other option?
Thanks,
Nate