Skip to content

Commit

Permalink
upd docs
Browse files Browse the repository at this point in the history
  • Loading branch information
@ais-one
ais-one committed Mar 5, 2024
1 parent e54eeb9 commit 1f0cc9d
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ cp apps/.env.sample apps/.env # secret properties can be in apps/.env.secret

```bash
# Commit and push to remote before running commands below
git fetch --tags upstream
# git fetch --tags upstream
git fetch --all
git merge upstream/<branch or tag> # or 'git merge upstream/<branch or tag> --allow-unrelated-histories'
# main = stable, dev = development, <tag> = previous stable
# There may be some template related merge conflicts to resolve.
Expand Down

0 comments on commit 1f0cc9d

Please sign in to comment.