academe / OmniPay-Payone

A PAYONE gateway driver for the OmniPay framework
MIT License
15 stars 16 forks source link

Invoicing for authorize request, sepa mandate id parameter and critical typo fix #18

Closed mcbuckets closed 7 years ago

judgej commented 7 years ago

Thanks. Could you merge in from the latest master branch to fix the merge conflicts? I think that critical typo may already be fixed in there, so it should be a straight forward merge.

mcbuckets commented 7 years ago

Is that possible? I think since commits are pushed to upstream you have to resolve them. I tried with one more commit but it doesn't work

judgej commented 7 years ago

Yes 'tis easy :-)

If you are using the command line, set up a remote to this repo (if you don't already have one) then do a pull from it into your repo:

pull thisremote master

Then result any merge conflicts if there are any, and push back to your master repo. That's it - the PR will reflect all those changes automatically.

judgej commented 7 years ago

It's not always easy to visualise just where you are, but you can often pull from any repo that shares a history, and it will be merged. The advantage of you doing it, is that you can make sure it works as you expect with the master branch of repo it will be merged into.

mcbuckets commented 7 years ago

Thanks, i created new pull request