turbaszek commented on pull request #10864:
URL: https://github.com/apache/airflow/pull/10864#issuecomment-691254882


   > > > The CI errors seem to be similar to #10153 as reported by @yuqian90
   > > 
   > > 
   > > Seems to be this issue: #10877 @SalAlba can you rebase please?
   > 
   > **For rebase** I made this
   > 
   > ```
   > git checkout sal-dev
   > 
   > git rebase master
   > 
   > git checkout master
   > 
   > git merge sal-dev
   > ```
   > 
   > _Hopefully this is the correct way !_
   
   This is nearly perfect. You should first fetch newest changes from 
apache/master. If you don't have apache remote I suggest this:
   ```
   git remote add apache [email protected]:apache/airflow.git
   git fetch --all
   # Then on your branch
   git rebase apache/master
   ```


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


Reply via email to