Closed mtalexander closed 1 month ago
Works for me on Mac Mini M1, on macOS 14.5 with Clang 15.
Works for me on Mac Mini M1, on macOS 14.5 with Clang 15.
How did you do it? Did you do a merge? Or did you just manually apply his machdep.c
changes? (which AFAIK are the only changes he is wanting to make?)
My concern, Bill, is whether the difference between his repository's version of the two mentioned .html
files will undo my previous commit or not. If they won't, then I can accept his Pull Request right now, as-is. But I don't want his Pull Request to undo anything that we've (I've) already done! Thus I'd be more comfortable if his repo was "current" (i.e. matched current 'develop'). Thus the request for a simple git pull to bring it current so its commits matches ours.
And now it looks like he has indeed pulled in the .html changes, but James just committed a change to zvector2.c
just today which he's missing.
I realize it's a PITA when the repo you're trying to create your Pull Request from keeps changing, but that's simply an unavoidable circumstance that you sometimes have to deal with. We can't ask others to stop their own development efforts just because someone else is wanting to Pull their own changes into the repo. (Well, I suppose we could, but it doesn't seem right somehow.)
Fish,
Works for me on Mac Mini M1, on macOS 14.5 with Clang 15.
How did you do it? Did you do a merge? Or did you just manually apply his
machdep.c
changes? (which AFAIK are the only changes he is wanting to make?)My concern, Bill, is whether the difference between his repository's version of the two mentioned
.html
files will undo my previous commit or not. If they won't, then I can accept his Pull Request right now, as-is. But I don't want his Pull Request to undo anything that we've (I've) already done! Thus I'd be more comfortable if his repo was "current" (i.e. matched current 'develop'). Thus the request for a simple git pull to bring it current so its commits matches ours.
I just edited machdep.c
by hand on top of what I cloned/checked-out shortly before I posted the comment here.
I didn't look at anything else.
You know I'm nervous with git and GitHub so I can't answer your question about undoing your/other more recent changes.
Bill
My Fix_qw2 branch is now completely up to date with develop and has been since about midnight Friday night. I don't think there is anything more that I can do at this point. Since I only changed one file and no one else has changed it in the last few days, this pull request is unlikely to have any nasty side effects.
Merged!
Undefined external symbols _fetch_qw_noswap and _store_qw_noswap.