-
Notifications
You must be signed in to change notification settings - Fork 2
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
Handle all contact import exceptions #15
Handle all contact import exceptions #15
Conversation
Add csv file required for test.
…external ID conflict" exception.
Add csv file required for test.
@darrick my version has changed since you wrote that code against it - you probably need to do a |
@eileenmcnaughton I'll see if I can also do that via the web interface. Fixing the conflicts was certainly easy. |
Not ready I'm trying our gh pr checkout 15 |
Well maybe just applying the diff will work for you. I'm not sure how to easily squash it. |
@darrick maybe I should rebase this whole branch over civicrm#23669 then - that is going to be merged in the next few hours so it might give you a cleaner test base |
actually I should be able to copy that in |
@eileenmcnaughton I'd like to just take a step back for now. I can always try to just do a PR later in the week. I'll get back to my code and see what else crops up. It's getting late here on the weekend. Through this whole time working with you I've really learned a lot and up my game as far as my development environment. But rebasing and merging is still a bit beyond me at times. |
4480ab5
to
92dbca9
Compare
@darrick I have pulled in your changes to mine & also rebased over the import_queue PR which is to be merged soon. It was a bit messy so I'm about to re-run tests - but I think my branch currently reflects our best combined wisdom |
b911f57
to
ef73857
Compare
ef73857
to
79e1afb
Compare
See if I'm able to resolve this merge on your PR via the Web interface. Internet says I should be able to do that.