tobixdev commented on PR #14202: URL: https://github.com/apache/datafusion/pull/14202#issuecomment-2602281685
So something has gone wrong here. For example, the `.devcontainer/Dockerfile` is equivalent to the one on main but I think that the information that this was a merge commit got lost at some point. So here is what I did: 1. Switch to a branch that tracks `logical-types` 2. `git merge upstream/main` 3. Resolve merge conflicts 4. Make a commit Is this the intended workflow? I didn't want to rebase so that I do not alter the existing commits. I think the best thing is to undo this commit? Is this easily possible as this is just a feature branch? I am now working on a different branch of mine to ensure that the merge commit is properly handled. Here is the diff between said branch and main which only contains the changes we are looking for as far as I know: - https://github.com/apache/datafusion/compare/main...tobixdev:datafusion:logical-types-fix?expand=1 I still have to wait for the checks though and some minor changes may be necessary. After the checks pass, what would be the best way to get this into the feature branch? Thanks for helping me with this :) -- 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] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
