Skip to content

Commit 5cfa6bb

Browse files
authored
Update docs/Resource Hub/Talon Installation/downloading-community.md
1 parent 71773dc commit 5cfa6bb

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

docs/Resource Hub/Talon Installation/downloading-community.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ To manage your custom changes while keeping up with upstream updates, it is advi
107107

108108
1. After cloning the repository, create and switch to a new branch (e.g. `git checkout -b custom`).
109109
2. If you make changes, commit them to this branch. Try to avoid creating commits that bunch together unrelated changes.
110-
3. In regular intervals, fetch changes from the upstream repository and merge the main branch into your custom branch. This may result in merge conflicts that then need to be resolved. The [upgrade-knausj script](https://github.com/pokey/upgrade-knausj) may help facilitate the process of merging changes.
110+
3. At regular intervals, fetch changes from the upstream repository and merge the main branch into your custom branch. This may result in merge conflicts that then need to be resolved. The [upgrade-knausj script](https://github.com/pokey/upgrade-knausj) may help facilitate the process of merging changes.
111111
4. If you do not mind other people looking at your local changes, create a fork of the community repository on GitHub, add it as a second remote to your local working copy, and push your custom branch there.
112112

113113
#### Using Git Worktrees and Cherry-Picking to Contribute to the Upstream Repository

0 commit comments

Comments
 (0)