This website uses Cookies. Click Accept to agree to our website's cookie use as described in our Privacy Policy. Click Preferences to customize your cookie settings.
Accept
Reject
Preferences
Log in to ask a question
Announcements
This site is in read only until July 22 as we migrate to a new platform; refer to this community post for more details.
Get hands-on experience with 20+ free Google Cloud products and $300 in free credit for new customers.
Log in to ask a question

Problem applying upstream updates - conflict

Posted on 01-22-2018 06:05 PM
Not applicable
Reply posted on --/--/---- --:-- AM

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,

0 2 1,442
Topic Labels
0 Likes
Reply
2 REPLIES 2
Top Solution Authors
View all