hesam-oxe commented on PR #11019: URL: https://github.com/apache/gravitino/pull/11019#issuecomment-4629245313
@mchades I've rebased on the latest main multiple times now, and each time the branch is clean locally. Yet GitHub consistently shows conflicts on `clients/client-python/gravitino/exceptions/base.py`. Could you help me understand what specific conflict you're seeing? Maybe there's a file I'm missing or a step I'm not following correctly. I've been following this process: 1. `git fetch origin main` 2. `git rebase origin/main` 3. Resolve any conflicts 4. `git push --force` If there's a different workflow you'd prefer, or if the conflict is on a file that's changed upstream since my last rebase, I'm happy to adjust. Just want to get this right so we can move forward with the 1.3.0 RC. 🙏 -- 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]
