Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
Thanks @simonmichal, I figured I might have butchered it.
(The third commit is bac553b; the third you listed I think is the same as the first.)
Going for the second option, I've done:
git checkout master
git checkout -b fix-vector-reserve
git cherry-pick 989e088ca3375d95b035abd0130e78689d4d28c9 bac553b75df1427e119699345c9a766f5792ddb3 666d8acaf162a49a1851cab220a5c5b4740dc776
That's produced a conflict on src/XrdMacaroons/XrdMacaroonsHandler.cc, so I've resolved that, and continued with:
git cherry-pick --continue
...and used the default commit message. I presume the next step is to push my local fix-vector-reserve over the fix-macaroons-reserve on the fork. From the new branch, I guess it's:
git push --force origin fix-macaroons-reserve
But please advise!
—
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
You are receiving this because you are subscribed to this thread.
Use REPLY-ALL to reply to list
To unsubscribe from the XROOTD-DEV list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=XROOTD-DEV&A=1