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" <[email protected]> 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 <[email protected]> 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" <[email protected]> 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 > >
