[GitHub] [airflow] potiuk commented on pull request #26970: Impala Hook

[GitBox <gi...@apache.org>]

potiuk commented on PR #26970:
URL: https://github.com/apache/airflow/pull/26970#issuecomment-1336124082

   Hmm. Once again (and I know it's again much too ask).
   
   Somehow your change keeps on getting conflicts but .. it should not. I think big problem is that you have multiple merges and you are merging main to your change rather than rebasing your commits on top of the latest main.
   
    I think this causes all kinds of problems that we have to ask you for rebase rather than doing the rebase ourselves when needed.
   
   This is what I see when I try to rebase now:
   
   <img width="503" alt="Screenshot 2022-12-03 at 10 40 20" src="https://user-images.githubusercontent.com/595491/205434475-aa9d9b41-20dd-45bb-b2f5-32d0b3a02ca1.png">
   
   Rebasing is way better than merging especially in the scenario that you have long running change that has some failures to be fixed. 
   
   Those "merge" commits that you have in the history of your PR are those that cause the conflicts:
   
   <img width="788" alt="Screenshot 2022-12-03 at 10 41 57" src="https://user-images.githubusercontent.com/595491/205434524-2773c881-49d0-40c0-9b51-7673de5d3b7f.png">
   
   Is it possible that you rebase your change ? Just squash your change into a single commit and rebase on top of main (see our CONTRIBUTING.rst for some guides on that).
   
   Currently you have this:
   
   <img width="505" alt="Screenshot 2022-12-03 at 10 36 37" src="https://user-images.githubusercontent.com/595491/205434352-1a58ce5f-f37b-46ba-8cc5-5b31211b146e.png">
   
   But what would be much better if you have "you are 1 commit ahead, 0 commits behind" and then we can rebase that one commit of yours on top


-- 
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.

To unsubscribe, e-mail: commits-unsubscribe@airflow.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org