dstandish commented on PR #37948: URL: https://github.com/apache/airflow/pull/37948#issuecomment-2048324458
Yeah @howardyoo I think it's a good practice and will result in fewer errors. Big bang PRs, while sometimes necessary, have a tendency for things to fall between the cracks, bugs and things to go unnoticed. Let me share what I have been doing over the last month or so with my work on AIP-44 which I think has worked pretty well for all parties. 1. "get it sorta working" 2. do a soft reset to main 3. Look at your local changes, and identify small changes that make sense as a single unit. Commit that, with a good name for the commit message. 4. Step through and repeat (3) till all your local changes are recommitted. 5. Copy the output of `git log --oneline` to text editor 6. Manipulate the lines to be ``` git checkout main git checkout -b <commit message> git cherry-pick <sha> ``` So e.g. each line I do a replace of ` ` with `-` and make lowercase then I can use multiline editing to quickly convert to that format. So then e.g. ``` 5db845e493 Do not log event when using db isolation (4 hours ago) <Daniel Standish> eb4117c50f Fix error when setting try_number from TaskInstancePydantic (4 hours ago) <Daniel Standish> a1d4eb0362 Remove unused attr _try_number on TaskInstancePydantic (4 hours ago) <Daniel Standish> 19dd3f2277 Fix check of correct dag when remote call for _get_ti (4 hours ago) <Daniel Standish> 4c6255b0c9 Add retry logic for RPC calls (4 hours ago) <Daniel Standish> ``` becomes ``` gco main git checkout -b do-not-log-event-when-using-db-isolation git cherry-pick 5db845e493 gpsup gco main git checkout -b fix-error-when-setting-try_number-from-taskinstancepydantic git cherry-pick eb4117c50f gpsup gco main git checkout -b remove-unused-attr-_try_number-on-taskinstancepydantic git cherry-pick a1d4eb0362 gpsup gco main git checkout -b fix-check-of-correct-dag-when-remote-call-for-_get_ti git cherry-pick 19dd3f2277 gpsup gco main git checkout -b add-retry-logic-for-rpc-calls git cherry-pick 4c6255b0c9 gpsup ``` (gpsup is `git push --set-upstream origin $(git_current_branch)`) It's less painful than I thought it might be originally. -- 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]
