stevedlawrence commented on pull request #461: URL: https://github.com/apache/incubator-daffodil/pull/461#issuecomment-735836073
For development branches like this, the workflow I've ususally seen and preferred is to just periodically rebase onto master when it seems appropriate. Eventually this branch will need to be rebased and committed, so doing it that way makes things a bit easier once that time comes. I think merge commits created by merging master into this branch could make that process more difficult. The downside as mentioned, is that it can cause some headaches if multiple people are working on this dev branch and it's constantly being rebased. I would suggest the solution here is to only rebase periodicaly (e.g once every month or two) and ensure there is good public communication when a rebase is needed/planned. If it needs to be rebased due to some new feature in master for example, send out an email to dev@ and give the usual 72 hours to make sure there are no outstanding commits for this dev branch. At that point, perform the rebase and send out an email saying it's been rebased and for people to update their branch. Note that we don't need a new PR for this dev branch rebase, we just trust that whoever does the rebase verified there were no issues before doing the force push. Also, any open PRs for this branch should still remain open and github should do the right thing. Though, ideally those PRs would be merged before the rebase to avoid any potential issues. ---------------------------------------------------------------- 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: [email protected]
