Closed jsermini closed 11 years ago
Cool, I think I merged it successfully. Fairly easy :)
On Thu, Mar 14, 2013 at 1:54 PM, jsermini notifications@github.com wrote:
Wondering if this is what I have to do to get my changes into main...
You can merge this Pull Request by running
git pull https://github.com/jsermini/WSPAPIPrototype master
Or view, comment on, or merge it at:
https://github.com/mozvat/WSPAPIPrototype/pull/19 Commit Summary
- Bare minimum to call Loyalty Post (AddCredits) and Get (GetCredits)
File Changes
- M WSPAPIPrototype/Loyalty.cshttps://github.com/mozvat/WSPAPIPrototype/pull/19/files#diff-0(210)
- M WSPAPIPrototype/frmMain.cshttps://github.com/mozvat/WSPAPIPrototype/pull/19/files#diff-1(3)
Patch Links:
Matthew Ozvat
Cool. All I did was fork it, then sync it, and then there was a place to request to merge it. There were two sets of changes. The first one had a bug, but if you got the latest, the bug is fixed.
John
From: Matthew Ozvat [mailto:notifications@github.com] Sent: Thursday, March 14, 2013 7:09 PM To: mozvat/WSPAPIPrototype Cc: jsermini Subject: Re: [WSPAPIPrototype] Loyalty (#19)
Cool, I think I merged it successfully. Fairly easy :)
On Thu, Mar 14, 2013 at 1:54 PM, jsermini notifications@github.com wrote:
Wondering if this is what I have to do to get my changes into main...
You can merge this Pull Request by running
git pull https://github.com/jsermini/WSPAPIPrototype master
Or view, comment on, or merge it at:
https://github.com/mozvat/WSPAPIPrototype/pull/19 Commit Summary
- Bare minimum to call Loyalty Post (AddCredits) and Get (GetCredits)
File Changes
- M WSPAPIPrototype/Loyalty.cshttps://github.com/mozvat/WSPAPIPrototype/pull/19/files#diff-0(210)
- M WSPAPIPrototype/frmMain.cshttps://github.com/mozvat/WSPAPIPrototype/pull/19/files#diff-1(3)
Patch Links:
Matthew Ozvat
— Reply to this email directly or view it on GitHub https://github.com/mozvat/WSPAPIPrototype/pull/19#issuecomment-14938874 . https://github.com/notifications/beacon/ZoWU2J_--auszrhxjyOvzI-RPT7Y8dBEYqHUOFH9hYh_fSPklh4LspqY76EAbwOQ.gif
Wondering if this is what I have to do to get my changes into main...