[GitHub] [arrow-datafusion] tustvold commented on pull request #3191: MINOR: Add branching model to contrib guide

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

tustvold commented on PR #3191:
URL: https://github.com/apache/arrow-datafusion/pull/3191#issuecomment-1219707975

   I think as both crates have a fairly regular release cadence this is fine. The risk would be if any of these branches live longer than a couple of weeks, as then the opportunity for a potentially non-trivial, error-prone final integration increases.
   
   FWIW I have typically just maintained draft PRs that build on each other for this purpose, and then rebased them individually to get them merged following the release.
   
   One thing that might be worth clarifying is how the final merge occurs, I presume we would rebase the integration branch and then do a fast forward merge? I ask as currently the only option would be a squash merge, which would lose any history from the integration branch (which may not be a problem but should be made explicit)


-- 
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.

To unsubscribe, e-mail: github-unsubscribe@arrow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org