Skip to content

Commit

Permalink
Update umbraco-cloud/set-up/project-settings/umbraco-cicd/Troubleshoo…
Browse files Browse the repository at this point in the history
…ting.md

Co-authored-by: jonat123 <[email protected]>
  • Loading branch information
jesp209i and jonat123 authored Jun 26, 2024
1 parent 0a47ae1 commit 8244167
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ error: src/UmbracoProject/UmbracoProject.csproj: patch does not apply

The root cause is due to conflicts between your source and the code in the repository on Umbraco Cloud. This is usually due to one of two things:

1. Cloud project package(s) has been auto upgraded, and that diff was already applied.
1. Cloud project package(s) has been auto-upgraded, and that diff was already applied.
2. You and your team are not following the ["left to right" deployment model](../../../deployment/README.md).

In both cases you have to make sure that your repository is up too speed with any changes there are in the cloud environment. You will have to resolve potential conflicts manually.
Expand Down

0 comments on commit 8244167

Please sign in to comment.