Skip to content

Commit 29514ae

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

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

ADD_TO_EXISTING_PACKAGE.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ $ git merge existing_code/<BRANCH> --allow-unrelated-histories
2121
4. The previous step will likely result in several merge conflicts. Solve the conflicts by editing the files.
2222
5. Add all the files to GitHub:
2323
```shell
24-
$ EDITOR CONFLICT_FILES
2524
$ git add --all
2625
$ git commit -m "Merged existing code with code generated by `cookiecutter https://github.com/NLeSC/python-template`"
2726
$ git push

0 commit comments

Comments
 (0)