These are chat archives for mirumee/saleor

14th
Dec 2016
Cephlin
@Cephlin
Dec 14 2016 10:32
Can you not just put 95% of your customisations into new files and then you can simply just pull from upstream when you want to update @orion-v?
There should be very minimal conflicts this way