Bỏ qua để đến Nội dung
Menu
Câu hỏi này đã bị gắn cờ
1 Trả lời
2327 Lượt xem

I try to update our v9c setup weekly, but it's causing a bit of a problem. We use a modified `main.py` file for the addon `payment_paypal` that works around issues with the return URL for Paypal. Everytime we update, this file is replaced with the original.


Before I go changing permissions and such in a semi-production setup (we're live testing with a few users), I wanted to ask everyone's opinion here. Suggestions?

Ảnh đại diện
Huỷ bỏ
Câu trả lời hay nhất

Seems that you need to setup git attributes to keep that file from being merged. Here is a good read about that

https://medium.com/@porteneuve/how-to-make-git-preserve-specific-files-while-merging-18c92343826b#.quw0ss97o

Ảnh đại diện
Huỷ bỏ