0k
/
0k-charms
6
3
Fork 2
Code Issues 11 Pull Requests 7 Releases Wiki Activity
Labels Milestones
New Pull Request

fix: [mattermost] conflict merging environment variables #46

Open
bgallet wants to merge 1 commits from bgallet/0k-charms:mattermost into master
Conversation 0 Commits 1 Files Changed 1
bgallet commented 3 weeks ago
Collaborator

To solve this conflict :

  ! mattermost/postgres-database (joined) @> destructed tmp dir /tmp/tmp.XKmywVJvk2.                                                                                                                                 
  ! Merging Failed: Unsupported types: MyOrderedDict, str.                                                                                                                                                           
  !   Conflicting key is 'services.mattermost.environment'.                                                                                                                                                          
  !   Values are:                                                                                                                                                                                                    
  !     v0: 'MM_SERVICESETTINGS_SITEURL=https://chat.coopawatt.fr'                                        
  !     v1: MyOrderedDict([('MM_SQLSETTINGS_DRIVERNAME', 'postgres'), ('MM_SQLSETTINGS_DATASOURCE', 'postgres://mattermost:5xp4NNXWvxrF50Kp@postgres:5432/mattermost?sslmode=disable&connect_timeout=10')])
  ! Error: Relation postgres-database on mattermost failed to run properly.
To solve this conflict : ``` ! mattermost/postgres-database (joined) @> destructed tmp dir /tmp/tmp.XKmywVJvk2. ! Merging Failed: Unsupported types: MyOrderedDict, str. ! Conflicting key is 'services.mattermost.environment'. ! Values are: ! v0: 'MM_SERVICESETTINGS_SITEURL=https://chat.coopawatt.fr' ! v1: MyOrderedDict([('MM_SQLSETTINGS_DRIVERNAME', 'postgres'), ('MM_SQLSETTINGS_DATASOURCE', 'postgres://mattermost:5xp4NNXWvxrF50Kp@postgres:5432/mattermost?sslmode=disable&connect_timeout=10')]) ! Error: Relation postgres-database on mattermost failed to run properly. ```
bgallet added 1 commit 3 weeks ago
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
Sign in to join this conversation.
Reviewers
Request review
No reviewers
Labels
Apply labels
Clear labels
bug
Something is not working duplicate
This issue or pull request already exists enhancement
New feature help wanted
Need some help invalid
Something is wrong question
More information is needed win wontfix
This won't be fixed
No Label bug duplicate enhancement help wanted invalid question win wontfix
Milestone
Set milestone
Clear milestone
No items
No Milestone
Assignees
Assign users
Clear assignees
No Assignees
1 Participants
Notifications
Due Date

No due date set.

Dependencies

This pull request currently doesn't have any dependencies.

Write Preview
Loading…
Cancel
Save
There is no content yet.
Delete Branch 'bgallet/0k-charms:mattermost'

Deleting a branch is permanent. It CANNOT be undone. Continue?

No
Yes