potiuk commented on issue #6670: [AIRFLOW-4816]MySqlToS3Operator URL: https://github.com/apache/airflow/pull/6670#issuecomment-571495974 But it does what it is supposed to do :. Once you rebased the code --onto upstream/master you get conflict. Then you should do exactly what the message says: 1) You need to resolve the conflict: see for example this thread: how to do it https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git but you can also use Pycharm/IntelliJ's fantastic VCS -> Git -> Resolve Conflicts tools. 2) Once you resolve the conflict and 'git add' all the changes resulting from that you need to do `git rebase --continue` (this is what the message suggests to do. 3) Once you are done you can `git push -f` the change to your master That's it. The important thing is that you must resolve conflict - this is usual. If you have different people modifying the same files, you get conflicts and you need to learn to solve them.
---------------------------------------------------------------- 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] With regards, Apache Git Services
