ktmud commented on pull request #11814: URL: https://github.com/apache/incubator-superset/pull/11814#issuecomment-742148730
> That's kind of how we approached much of this. We had folks open PRs onto the `dashboard-native-filters` branch in the Preset fork. But the reality when doing that is a lot of broken parts end up getting merged to unblock people. It's my first time trying that development style though, and I'd like to get better at it. I'd recommend opening such feature branch in the main repo for everyone to review. It's OK to have incomplete work or broken pieces here and there as long as they are behind a feature flag, but we should also strive for a stable base branch and high-quality PR descriptions/discussions even if it's just a feature branch. Developing the feature branch in the main repo helps with that. I'd imagine a work flow like this (which is also what I have been doing with https://github.com/apache-superset/superset-ui/pull/768): 1. Open a feature branch in `apache/incubator-superset`: ``` git checkout master git checkout -b feature--native-filter git push apache feature--native-filter ``` 2. Develop from feature branch: ``` git checkout -b feature--native-filter-reset-all git push mine ``` 3. Create a PR to merge `mine:feature--native-filter-reset-all` onto `feature--native-filter`. 4. To update the base branch, use `git rebase`: ``` git fetch apache --all git checkout feature--native-filter git rebase apache/master git push -f apache feature--native-filter # force update the remote feature branch ``` Fix merge conflicts if needed. 5. If you have an open sub-feature branch, use `git reset`: ``` git checkout feature--native-filter-reset-all git reset feature--native-filter # a "soft" reset that updates current HEAD to the rebased feature branch git commit -am 'my feature' # a clean one commit for the sub-feature branch ``` ---------------------------------------------------------------- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
