Conversation
Updating to template version 0.0.14
hint: Using 'master' as the name for the initial branch. This default branch name
hint: is subject to change. To configure the initial branch name to use in all
hint: of your new repositories, which will suppress this warning, call:
hint:
hint: git config --global init.defaultBranch <name>
hint:
hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and
hint: 'development'. The just-created branch can be renamed via this command:
hint:
hint: git branch -m <name>
Copying from template version 0.0.14
identical .
conflict setup.py
overwrite setup.py
conflict .copier-answers.yml
overwrite .copier-answers.yml
identical .github
identical .github/workflows
identical .github/workflows/tests.yml
identical CODE_OF_CONDUCT.md
identical noxfile.py
identical tests
conflict tests/test_corner.py
skip tests/test_corner.py
conflict LICENSE
overwrite LICENSE
conflict README.md
skip README.md
identical readthedocs.yaml
conflict pyproject.toml
overwrite pyproject.toml
conflict .gitignore
overwrite .gitignore
identical .pre-commit-config.yaml
identical src
identical src/corner
conflict src/corner/__init__.py
skip src/corner/__init__.py
identical CONTRIBUTING.md
> Running task 1 of 3: git init
> Running task 2 of 3: git add .
> Running task 3 of 3: pre-commit run --all-files || pre-commit run --all-files
for more information, see https://pre-commit.ci
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is an automated PR from https://github.com/dfm/copier-python
This updates the template to version 0.0.14. If there are merge conflicts,
they will be indicated with
*.rejfiles that will be committed to this branch.In this case, the
lintworkflow will fail, and you will need to resolve theseconflicts manually:
git checkout -b copier/0.0.14 origin/copier/0.0.14 # Fix the conflicts and commit git push origin copier/0.0.14Full update log below:
Copier log