PiyushXCoder commented on PR #7001: URL: https://github.com/apache/opendal/pull/7001#issuecomment-3676258532
> I had a bad pull which changed a ton of files. In trying to clean this up, I decided to simply start over. However, I cannot get this pull request to take the new branch. Any ideas how to fix this without creating a new pull request? Well, that is true that you should ask AI and learn. For now download a gui(I like gitk) or tui(lazygit) and a tool to help fix merge commits (like meld from gnome). Delete all the unnecessary commits which you believe is not yours. I think you must have rebase instead of merge in your PR. For this time use merge, the merge conflicts can be easily handled using meld. I can confirm rebase by comparing the commit id for same commits Your PR: Commit Id = bc9e37cf0cf8fa2c21f8a3c6e9d0850cd12fe3d3 <img width="2702" height="263" alt="image" src="https://github.com/user-attachments/assets/c5320c8d-a499-4417-842f-7b29300bf06f"; /> Main Branch: Commit Id = 03e72a5b8cfb02115e0b6bea18e0c9083932c69c <img width="2702" height="263" alt="image" src="https://github.com/user-attachments/assets/bfa01935-7b2e-4684-9766-e6ab3a91209c"; /> -- 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]
