kevingurney commented on PR #13750: URL: https://github.com/apache/arrow/pull/13750#issuecomment-1226102416
@raulcd - Thank you so much for your help! Yes, this was quite surprising to us, as well! Per your recommendation, I will go ahead and open a new pull request. Sorry again for this unexpected behavior! I believe the steps that led to this were something like the following: 1. We were pushing commits "as usual" to `mathworks/arrow:ARROW-15693`. They were showing up in the Pull Request interface as expected. 2. When we went to rebase our changes on top of the latest changes available in `mathworks/arrow:main` (using `git rebase main`), to our surprise, we ended up having 100+ commits that had diverged from upstream. This is when we realized something wasn't right. Unfortunately, we don't know exactly what we did along the way that led to this diverged state. 3. To move forward, we wanted to find a way to get out of the diverged state, before having someone else review our final changes. To achieve this, we thought we could just "reset" our feature branch to the state of `mathworks/arrow:main`, and then re-apply our changes as a single commit using `git apply <patch>`. 5. To "reset" our feature branch to the state of `mathworks/arrow:main`, we created another branch off of `mathworks:arrow:main`, and then set this local branch to track the upstream `mathworks/arrow:ARROW-15693` branch. To do this, we used the command: `git branch --set-upstream-to origin/ARROW-15693`. 6. Finally, to push the "reset" branch to GitHub, we ran `git push origin HEAD:ARROW-15693 --force`. As soon as we completed step 6., the pull request went into a "Merged" State. I hope that helps provide some insight into what happened here! Please don't hesitate to let me know if you need more information, or if anything above is unclear. I am happy to help debug this further if that would be useful. -- 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]
