Closed gro1m closed 2 years ago
Ah, we're getting conflicts now, naturally.
Ah, we're getting conflicts now, naturally.
resolved :)
@gro1m would you want me to take over this PR or can you fix the merge conflict so we can get this one merged?
Hi @aconrad I tried to merge the PR and resolve the conflict, but currently I can only do this via the editor, which is a bit error-prone. So if you could resolve it, great. Otherwise it will take me certainly another week until I can take a look at it.
Sounds good. I'll try to take a look at it today.
Oh, you did merge master and resolve the conflict actually. I can look at the failing tests then.
@gro1m here's a PR to fix tests: https://github.com/gro1m/pycobertura/pull/1
It's a PR against your branch on your fork. Not sure if that's the best way to go about it but heh, let's give it a try. 😄
@gro1m here's a PR to fix tests: gro1m#1
It's a PR against your branch on your fork. Not sure if that's the best way to go about it but heh, let's give it a try. 😄
Hi @aconrad That worked well, thanks! :)
🎉 Thanks folks!
Addresses https://github.com/aconrad/pycobertura/issues/146.
@aconrad Please review! FYI: @notpushkin