[GitHub] [metron] sardell commented on issue #1563: METRON-2318: Merge master into feature branch

[GitBox <gi...@apache.org>]

sardell commented on issue #1563: METRON-2318: Merge master into feature branch
URL: https://github.com/apache/metron/pull/1563#issuecomment-555119695
 
 
   @mmiklavc Unfortunately, this is how every PR has been when merging master into the feature branch. For example: https://github.com/apache/metron/pull/1507/commits
   
   As you can see, a lot of the commits listed here were merged into the feature branch already. Unfortunately, the squash merge does not retain the history in the feature branch. It gets even more complicated by the fact that we had to cherry-pick & re-write commits to accommodate the Apache attribution standards of the project.
   
   If there were no conflicts, I would merge master into the feature and push directly upstream, but since there are so many conflicts I followed previous examples of feature branch work like this one here by @nickwallen (which also contains a lot of commits unrelated to the PR): https://github.com/apache/metron/pull/1502

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services