potiuk commented on issue #6758: [AIRFLOW-6195] Fixed TaskInstance attrs not 
correct on UI
URL: https://github.com/apache/airflow/pull/6758#issuecomment-564180597
 
 
   Side comment @baolsen 
   
   FYI. We usually use rebase workflow during review rather than merge 
(https://www.atlassian.com/git/tutorials/merging-vs-rebasing). 
   
   While this is not as intuitive initially as merge  (if you are used to it),  
it is pretty well supported by Github (you can see snippets of old commits even 
if they are gone). This means that you have to often rebase on-top of master 
rather than have merge commits and get used to `push --force` for your own 
branch :).
   
   This has great benefit of being able to keep even multiple commits separated 
in ine PR and continuously rebased on top of latest master - which (if you do 
it often and change is small) is rather easy. Thenn when we review the code we 
can also review them commit-by-commit even if eventually they will get squashed 
as single commit. Having merge commits in between your commits makes it rather 
difficult to review it commit-by-commit - you have no option but review all of 
it.
   
   Also if you add `git commit --fixup` + `git rebase -i --autosquash` to the 
whole toolset you get some powerful workflow that allows you to keep your work 
logically separated into several commits and work on several commits at the 
same time.
   
   I switched to it few years ago and never looked back since.

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

Reply via email to