Skip to content

Commit

Permalink
Update customizations.md
Browse files Browse the repository at this point in the history
  • Loading branch information
mglatter authored Oct 22, 2021
1 parent 1d63344 commit 3cec8fd
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions docs/guides/customizations.md
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,8 @@ If there are any problems with the tags, using the specific commit SHAs should a
git cherry-pick 1.0.0..1.1.0
```

Now each commit of the new Intershop PWA release is applied to the custom project context. Thus, if any merge conflicts arise, this will be within the specific Intershop PWA commit context and should be mergeable with the information and diff provided for this commit in the GitHub repository.
Now each commit of the new Intershop PWA release is applied to the custom project context.
Thus, if any merge conflicts arise, this will be within the specific Intershop PWA commit context and should be mergeable with the information and diff provided for this commit in the GitHub repository.

After successfully going through the range cherry pick (with `git commit` and `git cherry-pick --continue` after each resolved merge conflict), an `npm install` will probably be required and one needs to check whether the project code still works as expected.
Starting the server or `npm run check` are good basic tests for that.
Expand All @@ -236,7 +237,8 @@ If there are any problems with the tag, using the specific commit SHAs should al
git rebase --onto develop 1.0.0
```

Now each commit of the new Intershop PWA release is applied to the custom project context. Thus, if any merge conflicts arise, this will be within the specific Intershop PWA commit context and should be mergeable with the information and diff provided for this commit in the GitHub repository.
Now each commit of the new Intershop PWA release is applied to the custom project context.
Thus, if any merge conflicts arise, this will be within the specific Intershop PWA commit context and should be mergeable with the information and diff provided for this commit in the GitHub repository.

After successfully going through the "rebase onto" (with `git rebase --continue` after each resolved merge conflict), an `npm install` will probably be required and one needs to check whether the project code still works as expected.
Starting the server or `npm run check` are good basic tests for that.
Expand Down

0 comments on commit 3cec8fd

Please sign in to comment.