Skip to content
This repository was archived by the owner on Feb 6, 2025. It is now read-only.

Commit c504324

Browse files
committed
(docs): Implementing Paz's feedback regarding the Amplication branch.
1 parent 4df869e commit c504324

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

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

+7-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ For example, let's say you've just added a new _Task_ entity to your project. On
4545
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.
4646

4747
:::note
48-
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.
48+
After the Amplication build completes, review the PR, resolve any conflicts, and merge it.
49+
50+
**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.
4951
:::
5052

5153
## The `amplication` branch
@@ -60,8 +62,10 @@ For example, Amplication will base the `amplication` branch from `main` if your
6062

6163
You can merge Amplication-made changes by merging pull requests created by Amplication from the `amplication` branch to your repository's default branch.
6264

63-
:::note
64-
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, resolve it on the `amplication` branch. Do not delete the `amplication` branch.
65+
:::warning
66+
**Do not delete the `amplication` branch**.
67+
68+
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.
6569
:::
6670

6771
![](./assets/sync-with-git-provider/github-pull-request.png)

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,14 @@ And there you have it – a new pull request ready for review.
120120

121121
![bitbucket-pull-request](./assets/sync-with-git-provider/bitbucket-pull-request.png)
122122

123-
Amplication creates pull requests from the `amplication` branch into your repository's default base branch. In case of conflict, resolve it on the `amplication` branch. Do not delete or modify the `amplication` branch. Pro and Enterprise users can [change the base branch for these pull requests](/how-to/change-base-branch-for-pull-requests).
123+
## Merging Amplication's Pull Request into your branch
124+
125+
Amplication creates pull requests from the `amplication` branch into your repository's default base branch.
126+
Amplication triggers the creation of a commit on the changed files whenever a new build is performed on a project.
127+
The changed files are all the files that were added, removed, or changed from the last build.
128+
129+
:::warning
130+
**Do not delete the `amplication` branch**.
131+
132+
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.
133+
:::

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,10 @@ Now let's review what happens from GitHub's side when Amplication generates a ne
142142
Amplication triggers the creation of a commit on the changed files whenever a new build is performed on a project.
143143
The changed files are all the files that were added, removed, or changed from the last build.
144144

145-
:::note
146-
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, resolve it on the `amplication` branch. Do not delete the `amplication` branch.
145+
:::warning
146+
**Do not delete the `amplication` branch**.
147+
148+
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.
147149
:::
148150

149151
![A pull request generated by Amplication on GitHub](./assets/sync-with-git-provider/github-pull-request-amplication-branch.png)

0 commit comments

Comments
 (0)