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
