We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 2fcd6f9 commit 29514aeCopy full SHA for 29514ae
1 file changed
ADD_TO_EXISTING_PACKAGE.md
@@ -21,7 +21,6 @@ $ git merge existing_code/<BRANCH> --allow-unrelated-histories
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:
23
```shell
24
-$ EDITOR CONFLICT_FILES
25
$ git add --all
26
$ git commit -m "Merged existing code with code generated by `cookiecutter https://github.com/NLeSC/python-template`"
27
$ git push
0 commit comments