Skip to content
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

Conversation

darrick
Copy link

@darrick darrick commented Jun 6, 2022

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.

@eileenmcnaughton
Copy link
Owner

@darrick my version has changed since you wrote that code against it - you probably need to do a git pull --rebase eileen contact_out

@darrick
Copy link
Author

darrick commented Jun 6, 2022

@eileenmcnaughton I'll see if I can also do that via the web interface. Fixing the conflicts was certainly easy.

@darrick darrick marked this pull request as ready for review June 6, 2022 02:19
@darrick
Copy link
Author

darrick commented Jun 6, 2022

Not ready I'm trying our gh pr checkout 15

@darrick
Copy link
Author

darrick commented Jun 6, 2022

Well maybe just applying the diff will work for you. I'm not sure how to easily squash it.

@eileenmcnaughton
Copy link
Owner

@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

@eileenmcnaughton
Copy link
Owner

actually I should be able to copy that in

@darrick
Copy link
Author

darrick commented Jun 6, 2022

@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.

@eileenmcnaughton
Copy link
Owner

@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

@eileenmcnaughton eileenmcnaughton force-pushed the contact_out branch 4 times, most recently from b911f57 to ef73857 Compare June 7, 2022 01:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants