Upgrade #2901
Unanswered
mattyg2301
asked this question in
Help with using Postal
Upgrade
#2901
Replies: 1 comment 3 replies
-
It sounds like you made some changes to your local installer which git is struggling with. I would |
Beta Was this translation helpful? Give feedback.
3 replies
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
-
Good day all,
I noticed version 3 is out and after trying to follow the upgrade command as per the documentation I get the below error:
/opt/postal/install# git pull origin
warning: redirecting to https://github.com/postalserver/install/
Auto-merging templates/docker-compose.yml
CONFLICT (modify/delete): templates/docker-compose.v3.yml deleted in HEAD and modified in c82658da7fa16615a2fba9bae2d02c860816fdb3. Version c82658da7fa16615a2fba9bae2d02c860816fdb3 of templates/docker-compose.v3.yml left in tree.
CONFLICT (modify/delete): examples/postal.v3.yml deleted in HEAD and modified in c82658da7fa16615a2fba9bae2d02c860816fdb3. Version c82658da7fa16615a2fba9bae2d02c860816fdb3 of examples/postal.v3.yml left in tree.
Auto-merging bin/postal
CONFLICT (content): Merge conflict in bin/postal
Automatic merge failed; fix conflicts and then commit the result.
Not sure how to resolve, any advise would be greatly appreciated.
Beta Was this translation helpful? Give feedback.
All reactions