mbeckerle commented on pull request #461:
URL:
https://github.com/apache/incubator-daffodil/pull/461#issuecomment-733951271
I would like @stevedlawrence to weigh in on the proper git workflow for
this long-lived branch that we want to keep current with master while remaining
on a separate branch.
In principle, this seems simple. Periodically rebase this runtime2-2202
branch on top of master, but I can see how that requires a force-push each time
and a force-push on a fork dev branch is fine (and part of our standard
workflow), but on a branch like this runtime2-2202 that others will be fetching
and using, it's pretty likely to cause trouble.
The alternative maybe is to rebase this runime2-2202 branch on top of
master, then git checkout runtime2-2202-N (where N = 1, 2, ....) and push that
new branch each time. That clutters the repo with new branches though.
----------------------------------------------------------------
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]
