Hi,
I am trying to apply updates to our Dev site on pantheon. When I click on Apply updates, it gives this error: We were not able to perform the merge safely. See the Applying Upstream Updates doc for further debugging tips.
I tried to auto-resolve conflicts, but I get the following error:
CONFLICT (content): Merge conflict in sites/default/settings.php,CONFLICT (rename/delete): sites/all/modules/diff/CHANGELOG.txt deleted in upstream/master and renamed in HEAD. Version HEAD of sites/all/modules/diff/CHANGELOG.txt left in tree.
Anyone ran into this problem?
Thanks,
Sounds like you have 2 issues:
Deleting changelog.txt did it. Thanks Karl.
User | Count |
---|---|
7 | |
2 | |
2 | |
1 | |
1 |