Skip to content

Commit c483d2b

Browse files
authored
Update ADD_TO_EXISTING_PACKAGE.md
1 parent b7a8fd3 commit c483d2b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ADD_TO_EXISTING_PACKAGE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ $ git merge existing_code/<BRANCH> --allow-unrelated-histories
2121
```
2222

2323
4. The previous step will likely result in several merge conflicts. Solve the conflicts by editing the files.
24-
5. Add all the files to GitHub:
24+
5. Once all conflicts have been resolved then add all the files to GitHub:
2525
```shell
2626
$ git add --all
2727
$ git commit -m "Merged existing code with code generated by cookiecutter"

0 commit comments

Comments
 (0)