rusackas commented on PR #28434: URL: https://github.com/apache/superset/pull/28434#issuecomment-2110553009
Yeah, something here isn't right. I suspect you're merging `master` onto your feature branch rather than rebasing. @mistercrunch might have the git-fu to get us out of this mess, but here's a [randomly-slected article](https://www.atlassian.com/git/tutorials/merging-vs-rebasing) on the difference that _miiiight_ help. -- 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: notifications-unsubscr...@superset.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@superset.apache.org For additional commands, e-mail: notifications-h...@superset.apache.org
