Merge pull request #510 from amplication/docs/update-amplication-branch-info

Docs: Update Amplication Branch Info

Author: PazYanoverr

docs/getting-started/smart-git-sync.md

@@ -44,8 +44,10 @@ For example, let's say you've just added a new _Task_ entity to your project. On
 
 This method ensures that every single change you make in your Amplication project is automatically tracked and committed to the `amplication` branch in your Git repository. You can then easily review and merge these changes through pull requests.
 
-:::info
-After the Amplication build completes, review the PR, resolve any conflicts, and merge it. **Keep the `amplication` branch and avoid deleting it**.
+:::note
+After the Amplication build completes, review the PR, resolve any conflicts, and merge it.
+
+**Keep the `amplication` branch and avoid deleting it**. In case of conflicts, handle them on the `amplication` branch and perform commits there. Regular development work should not be done on this branch.
 :::
 
 ## The `amplication` branch
@@ -61,7 +63,9 @@ For example, Amplication will base the `amplication` branch from `main` if your
 You can merge Amplication-made changes by merging pull requests created by Amplication from the `amplication` branch to your repository's default branch.
 
 :::note
-Refrain from modifying the `amplication` branch directly. Creating new commits or merging changes from other branches can introduce bugs and inconsistencies. In case of conflict, delete the `amplication` branch and resolve the merge conflict in the next PR.
+**Do not delete the `amplication` branch**.
+
+Do not modify the `amplication` branch, except to resolve conflicts. Handle conflicts directly on the `amplication` branch. Avoid creating new commits or merging changes from other branches to prevent bugs and inconsistencies.
 :::
 
 ![](./assets/sync-with-git-provider/github-pull-request.png)

docs/getting-started/sync-with-bitbucket.md

@@ -120,4 +120,14 @@ And there you have it – a new pull request ready for review.
 
 ![bitbucket-pull-request](./assets/sync-with-git-provider/bitbucket-pull-request.png)
 
-Amplication creates pull requests from the `amplication` branch into your repository's default base branch. Pro and Enterprise users can [change the base branch for these pull requests](/how-to/change-base-branch-for-pull-requests)
+## Merging Amplication's Pull Request into your branch
+
+Amplication creates pull requests from the `amplication` branch into your repository's default base branch.
+Amplication triggers the creation of a commit on the changed files whenever a new build is performed on a project.
+The changed files are all the files that were added, removed, or changed from the last build.
+
+:::note
+**Do not delete the `amplication` branch**.
+
+Do not modify the `amplication` branch, except to resolve conflicts. Handle conflicts directly on the `amplication` branch. Avoid creating new commits or merging changes from other branches to prevent bugs and inconsistencies.
+:::

docs/getting-started/sync-with-github.md

@@ -142,6 +142,12 @@ Now let's review what happens from GitHub's side when Amplication generates a ne
 Amplication triggers the creation of a commit on the changed files whenever a new build is performed on a project.
 The changed files are all the files that were added, removed, or changed from the last build.
 
+:::note
+**Do not delete the `amplication` branch**.
+
+Do not modify the `amplication` branch, except to resolve conflicts. Handle conflicts directly on the `amplication` branch. Avoid creating new commits or merging changes from other branches to prevent bugs and inconsistencies.
+:::
+
 ![A pull request generated by Amplication on GitHub](./assets/sync-with-git-provider/github-pull-request-amplication-branch.png)
 
 Amplication reduces the chances of user changes being overridden by interacting with the user’s repository through an `amplication` branch. This branch is created in your selected repository by Amplication's GitHub App.
@@ -172,7 +178,7 @@ It will take you to the specific build log for this commit on Amplication.
 
 ## Merging your pull request
 
-After clicking on `Merge`, you can safely delete this branch. You can then navigate back to your main branch where you will find your Amplication code.
+After clicking on `Merge`, do not delete the `amplication` branch. You can then navigate back to your main branch where you will find your Amplication code.
 
 ![](./assets/sync-with-git-provider/4d38da6f-9b1c-4844-91ec-ec9b101c4503.png)