dmitrii-fediuk / 5.9.188.84

The 5.9.188.84 server settings
https://upwork.com/fl/mage2pro
0 stars 0 forks source link

[Discourse] «Your local changes to the following files would be overwritten by merge: templates/postgres.template.yml» on `./launcher rebuild` #61

Closed dmitrii-fediuk closed 3 months ago

dmitrii-fediuk commented 3 months ago

2024-05-30--04-20-20

dmitrii-fediuk commented 3 months ago
git checkout -- templates/postgres.template.yml
git pull
sed -i 's/sleep 5/sleep 60/g' templates/postgres.template.yml
dmitrii-fediuk commented 2 months ago

How do I workaround «Your local changes to the following files would be overwritten by merge» on ./launcher rebuild?