Problem applying upstream updates - conflict

Not applicable

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,215
2 REPLIES 2

@Mike Smith

Sounds like you have 2 issues:

  1. You've renamed CHANGELOG.txt to something else in your codebase, and it doesn't exist in the upstream. Deleting your version should resolve the issue, you can always add it back later if you need this file.
  2. You've modified sites/default/settings.php - don't do this. Put this file back in its previous state. Any changes you need should be placed into a settings.local.php file in the same directory.

Deleting changelog.txt did it. Thanks Karl.