mjpieters commented on pull request #11997: URL: https://github.com/apache/airflow/pull/11997#issuecomment-721678062
> Hi @mjpieters, > Thanks for the help so far. > I pulled the lastest master and merged it with my branch. there was a conflict. resolved that and now views.py is showing a lot of changes. Does it look right? isn't it supposed to show only my changes? Not sure what you did wrong, but you seem to had a bad rebase. You need to go back to 590dd00 (the last revision you pushed), but how you get there depends on what you did. Sorry, I don't have the time right now to analyse what your tree is looking like. ---------------------------------------------------------------- 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]
