[GitHub] [airflow] potiuk commented on pull request #27802: Read logs from all containers in pod for KubernetesPodOperator

Sat, 03 Dec 2022 09:40:53 -0800 


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

   > Eventually when we merge in the GitHub UI, we can choose "Squash and 
Merge" option. That should be sufficient?
   
   When we merge yes. But squashing is really helpful when you continue 
rebasing stuff while new commits are coming on main. The problem when you 
`merge` using the UI rather than rebase is that your PR history gets like this:
   
   <img width="744" alt="Screenshot 2022-12-03 at 18 30 39" 
src="https://user-images.githubusercontent.com/595491/205453863-8b1ae5c0-13e5-441f-8e32-5905516e2cb9.png";>
   
   Not a problem just yet in this case - but with a number of merge commits for 
the past, this leads to the problem that you cannot easily rebase any more 
because those past merges are often conflicting with current main.
   
   So  in our case where you keep on rebasing, that becomes more and more 
problematic (and then eventually we cannot help by rebasing the PR while 
reviewing it using "Update with rebase". 
   
   <img width="444" alt="Screenshot 2022-12-03 at 18 35 33" 
src="https://user-images.githubusercontent.com/595491/205454063-0313d842-d1ee-48f5-9186-92e01bb5c5c0.png";>
   
   This is often useful, when we fix things in main - we can rebase a PR 
without asking a contributor to do so. This is  for exmple #26970 - I have to 
always ask the author to do it now.
   
   On the other hand, when you squash those changes (including past merges)  
and rebase, further rebasing becomes painless - because you effectively remove 
all those merges and what remains is only your change - solving conflicts on 
rebasing then is much simpler.
   
   


-- 
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: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]

Reply via email to