gistfile1.txt

skeleton master $ git merge --no-commit upstream/master
Auto-merging tox.ini
Auto-merging skeleton.md
CONFLICT (content): Merge conflict in skeleton.md
Auto-merging setup.cfg
CONFLICT (content): Merge conflict in setup.cfg
Auto-merging pytest.ini
CONFLICT (content): Merge conflict in pytest.ini
CONFLICT (modify/delete): pin-pip.py deleted in upstream/master and modified in HEAD. Version HEAD of pin-pip.py left in tree.
Auto-merging docs/conf.py
CONFLICT (content): Merge conflict in docs/conf.py
Auto-merging README.rst
CONFLICT (content): Merge conflict in README.rst
Auto-merging .flake8
Automatic merge failed; fix conflicts and then commit the result.
skeleton master $ git mergetool
Merging:
README.rst
docs/conf.py
pin-pip.py
pytest.ini
setup.cfg
skeleton.md

Normal merge conflict for 'README.rst':
  {local}: modified file
  {remote}: modified file

Normal merge conflict for 'docs/conf.py':
  {local}: modified file
  {remote}: modified file

Deleted merge conflict for 'pin-pip.py':
  {local}: modified file
  {remote}: deleted
Use (m)odified or (d)eleted file, or (a)bort? d

Normal merge conflict for 'pytest.ini':
  {local}: modified file
  {remote}: modified file

Normal merge conflict for 'setup.cfg':
  {local}: modified file
  {remote}: modified file

Normal merge conflict for 'skeleton.md':
  {local}: modified file
  {remote}: modified file
skeleton master $ git status
On branch master
Your branch is up to date with 'origin/master'.

All conflicts fixed but you are still merging.
  (use "git commit" to conclude merge)

Changes to be committed:

        modified:   .flake8
        new file:   .pre-commit-config.yaml
        modified:   README.rst
        modified:   docs/conf.py
        deleted:    pin-pip.py
        modified:   pyproject.toml
        modified:   pytest.ini
        modified:   setup.cfg
        modified:   skeleton.md
        modified:   tox.ini

skeleton master $ git checkout -b new-branch
M       .flake8
A       .pre-commit-config.yaml
M       README.rst
M       docs/conf.py
D       pin-pip.py
M       pyproject.toml
M       pytest.ini
M       setup.cfg
M       skeleton.md
M       tox.ini
Switched to a new branch 'new-branch'
skeleton new-branch $ git status
On branch new-branch
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   .flake8
        new file:   .pre-commit-config.yaml
        modified:   README.rst
        modified:   docs/conf.py
        deleted:    pin-pip.py
        modified:   pyproject.toml
        modified:   pytest.ini
        modified:   setup.cfg
        modified:   skeleton.md
        modified:   tox.ini