New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update path.c #587
Update path.c #587
Conversation
Seems like the failed ci is related to one of the tests not working. Otherwise since Travis doesn't seem to have a Mingw integration, so manual testing is needed |
The test has been fixed in the meantime (so you could rebase to get a green tick), but indeed a MinGW CI is missing, which could be one reason this code breakage wasn't noticed earlier. A MinGW CI could be set up on AppVeyor. |
Oh, great. But rebasing on git is new for me, and after some research I haven't figured out the correct way to do it. Can you give a few examples for this case? Thanks! Here is a list of what I've tried:
|
I don't know how you set up your repository, so giving commands is always a little dangerous. Assuming you have a remote called " git fetch munificent
git rebase munificent/master And assuming you've got your own repo pointed to by the remote
|
Strange. Only the 32-bit Mac CIs failed with the |
@crides Where did the merge commit come from? Did you forget the git fetch munificent
git rebase munificent/master
git pull # Should not have done a pull!
git push When you pulled your own master branch, you created a merge commit that merged your non-rebased version of the patch to So now we need to somehow clean up the mess. You can start by throwing away the merge commit: git reset --hard HEAD^ Then your local master should be a clean version of munificent's master, plus your one patch to If everything looks alright, force-push to the
|
Sorry for that... I am not really familiar with merging branches and rebasing. Also, my bad for not looking into |
Got to this one first: #657 (Sorry, I should have merged yours in since it was older, but I didn't notice it.) |
Might be an error?
path
is obviously not astruct
and should not use the->
operator.