Nj-kol commented on pull request #10084: URL: https://github.com/apache/incubator-superset/pull/10084#issuecomment-654914273
> TBH this looks like GitHub isn't working correctly. The unrelated changes are already merged on master, so they shouldn't show up as changes. Let's wait a while and see if GH snaps out of it in automatically. Hmm, let's see. On the bright side, I see the CI pipeline working. FYI, I followed these steps for rebasing ```## Step 1 : Switch from the feature branch ( of pull request ) to master branch git checkout master ## Step 2 : Add an upstream git remote add upstream <upstreamrepourl> Ex - git remote add upstream https://github.com/apache/incubator-superset.git * At this point, you'll have two remotes git remote -v ``` origin https://github.com/Nj-kol/incubator-superset (fetch) origin https://github.com/Nj-kol/incubator-superset (push) upstream https://github.com/apache/incubator-superset.git (fetch) upstream https://github.com/apache/incubator-superset.git (push) ``` ## Step 3 : Rewrite your forked master branch Any commits of yours that aren't already in ```upstream master``` are replayed on top of that other branch: git pull --rebase upstream master ## Step 4 : Checkout PR branch git checkout bugfix/#9967 ## Rebase PR branch with forked master git rebase master ## Resolve merge conflicts * Resolve Conflicts from 16:00 * If there are a lot of merge conflicts, you can abort the rebase and go back using : git rebase --abort ## Add the merge resolved files git add tests/db_engine_specs/hive_tests.py git add requirements-dev.txt ## Commit the changes git commit -m "Some message" ## Rebase again git rebase --continue ## Push changes from PR branch git push --force ```` ---------------------------------------------------------------- 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]
