baolsen edited a comment on issue #6758: [AIRFLOW-6195] Fixed TaskInstance attrs not correct on UI URL: https://github.com/apache/airflow/pull/6758#issuecomment-564401248 Thanks guys, I have just recently learned about rebase, thanks to this project. Here is the flow I am using currently, suggestions welcome :) Once-off, set up my fork and configure upstream as follows git remote -v origin https://github.com/baolsen/airflow.git (fetch) origin https://github.com/baolsen/airflow.git (push) upstream https://github.com/apache/airflow.git (fetch) upstream https://github.com/apache/airflow.git (push) To keep my local master up to date: git checkout master git fetch upstream git merge upstream/master master Update my fork's master: git push -f origin To keep my feature branch up to date: git checkout <branch> git rebase -i master (squash into 1 commit per commit guidelines) git push -f origin Here is where I think I'm going wrong. I had thought that exactly 1 commit was needed. So if I understand you correctly, the changes made because of code review should not be squashed into the first commit, i.e there should be 2+ commits as a result of the review process. 1 original, +1 for each review. Then you (committers/maintainers) can squash them all again down to 1 commit when the PR gets merged. Is that roughly correct? For someone new to re-basing (and contributing in general) I did followed the contrib guide but it was a little unclear to me what the process is. Also I force pushed and lost changes to one of my first PRs. Anyway I was aiming to clarify and add these steps explicitly to the contrib guide to make it clearer for others, so really appreciate your feedback here :)
---------------------------------------------------------------- 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
