Skip to content

Commit 2fcd6f9

Browse files
eriktkssverhoeven
andauthored
Update ADD_TO_EXISTING_PACKAGE.md
Co-authored-by: Stefan Verhoeven <stefan.verhoeven@gmail.com>
1 parent 1be89be commit 2fcd6f9

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

ADD_TO_EXISTING_PACKAGE.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ $ git fetch existing_code
1818
$ git merge existing_code/<BRANCH> --allow-unrelated-histories
1919
```
2020

21-
4. The previous step will likely result in several merge conflicts. Solve the conflicts by editing the files and add the files to Git:
21+
4. The previous step will likely result in several merge conflicts. Solve the conflicts by editing the files.
22+
5. Add all the files to GitHub:
2223
```shell
2324
$ EDITOR CONFLICT_FILES
2425
$ git add --all

0 commit comments

Comments
 (0)