OK, so I ran a test...
/var/www/html/moodle$ git branch -a
* MOODLE_38_STABLE
master
remotes/origin/HEAD -> origin/master
remotes/origin/MOODLE_13_STABLE
remotes/origin/MOODLE_14_STABLE
...
remotes/origin/MOODLE_37_STABLE
remotes/origin/MOODLE_38_STABLE
:
The git pull gave me this:
/var/www/html/moodle$ git pull
remote: Counting objects: 15237, done.
remote: Compressing objects: 100% (5145/5145), done.
remote: Total 15237 (delta 10220), reused 13243 (delta 9697)
Receiving objects: 100% (15237/15237), 8.80 MiB | 8.67 MiB/s, done.
Resolving deltas: 100% (10220/10220), done.
From git://git.moodle.org/moodle
bbc79e490a7..99b17429618 MOODLE_38_STABLE -> origin/MOODLE_38_STABLE
* [new branch] MOODLE_310_STABLE -> origin/MOODLE_310_STABLE
66041145712..598064e4d99 MOODLE_35_STABLE -> origin/MOODLE_35_STABLE
868f9fa5bdd..f6e37fe1953 MOODLE_37_STABLE -> origin/MOODLE_37_STABLE
* [new branch] MOODLE_39_STABLE -> origin/MOODLE_39_STABLE
71a34a039fd..5486b031eeb master -> origin/master
* [new tag] v3.5.14 -> v3.5.14
* [new tag] v3.7.8 -> v3.7.8
* [new tag] v3.5.13 -> v3.5.13
* [new tag] v3.7.7 -> v3.7.7
* [new tag] v3.8.4 -> v3.8.4
* [new tag] v3.8.5 -> v3.8.5
* [new tag] v3.9.0 -> v3.9.0
* [new tag] v3.9.0-rc2 -> v3.9.0-rc2
* [new tag] v3.9.0-rc3 -> v3.9.0-rc3
* [new tag] v3.9.1 -> v3.9.1
* [new tag] v3.9.2 -> v3.9.2
Updating bbc79e490a7..99b17429618
error: Your local changes to the following files would be overwritten by merge:
admin/cli/install.php
admin/environment.xml
<output omitted>
lib/adminlib.php
lib/amd/bu
error: The following untracked working tree files would be overwritten by merge:
admin/tool/usertours/pix/t/filler.png
completion/tests/behat/completion_other_courses.feature
<output omitted>
pix/t/uplong.png
pix/t/uplong.svg
Please move or remove them before you merge.
Aborting