Open wilsonpage opened 8 years ago
@indianburger can you review this and see if it fixes your issues?
@indianburger I need to write some unit-tests, but don't want to block you 😃
I've added a pretty detailed comment above the new conflict resolution code. It's late and I'm tired, so I could have easily missed something.
@indianburger what's your status? Have you found a workaround or are you still interested in this fix?
Looks good and works for us. 👍🏾
Also to note, we hacked a version together to unblock us temporarily. So feel free to take a bit more time to add tests and do it proper.
Cool. I'm on vacation for the next week. I'll be able to take a look next week.
Start
Coverage decreased (-3.6%) to 94.815% when pulling a8145a4402c88632bf0225a5455897ac7c870b10 on 90-version-compat into 5614caa7cb6577810f836bb532098581f1283e42 on master.