How do I properly update local repository?

I’ve used “make update” like the Blender wiki said, but I got errors and conflicts - which I have partially listed below. I have three local branches on my computer: master, experimental, and blender_patch_templates

My local master is an untouched copy cloned a month ago. The other two branches have changes but they have been added and committed. TortoiseGit gave them the green checkmark overlays.

Does anyone know what’s wrong? How do I properly update my local repository?

CONFLICT (content): Merge conflict in GNUmakefile
Auto-merging CMakeLists.txt
CONFLICT (content): Merge conflict in CMakeLists.txt
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Second commit. Don't know why this was necessary, but it was
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Entering 'release/datafiles/locale'
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.
fatal: run_command returned non-zero status for release/datafiles/locale
.
C:\BlenderSrc\blender>CONFLICT (content): Merge conflict in GNUmakefile
'CONFLICT' is not recognized as an internal or external command,
operable program or batch file.

C:\BlenderSrc\blender>Auto-merging CMakeLists.txt
'Auto-merging' is not recognized as an internal or external command,
operable program or batch file.

C:\BlenderSrc\blender>CONFLICT (content): Merge conflict in CMakeLists.txt
'CONFLICT' is not recognized as an internal or external command,
operable program or batch file.

C:\BlenderSrc\blender>Auto-merging .gitignore
'Auto-merging' is not recognized as an internal or external command,
operable program or batch file.

C:\BlenderSrc\blender>CONFLICT (content): Merge conflict in .gitignore
'CONFLICT' is not recognized as an internal or external command,
operable program or batch file.

C:\BlenderSrc\blender>error: Failed to merge in the changes.
'error:' is not recognized as an internal or external command,
operable program or batch file.

C:\BlenderSrc\blender>hint: Use 'git am --show-current-patch' to see the failed patch
'hint:' is not recognized as an internal or external command,
operable program or batch file.

C:\BlenderSrc\blender>Patch failed at 0001 Second commit. Don't know why this was necessary, but it was
Patch: 0001: extra operand
Patch: Try `Patch --help' for more information.

There is some information here, but this is general git usage for which there are better tutorials elsewhere.
https://wiki.blender.org/wiki/Tools/Git

Run git status to see what might be wrong, or git log master to see if there really are no extra changes.

OS: Windows 10
Git Tool: TortoiseGit

Ok, I believe, I now have a fresh untouched clone of the git repository that was cloned about a month ago after following the wiki clone and build instructions. It is, of course, in it’s original modified state unfortunately. Now I need some direction of how to handle the update process. I’ve read a few tutorials on git pull --rebase, and they don’t seem to be enough, but maybe I just need to study a little more…?

One month ago, after following the wiki build instructions and cloning, I originally IMMEDIATELY decided to commit my untouched master branch. This was because the original clone was in a modified state for some strange reason. So I just assumed I was supposed to commit the untouched clone.

Today, in order to get back to the fresh untouched clone state I ran these commands while checked out within master:

git branch -D experimental (my other branch besides master)
git reset
git checkout .
git clean -fdx
git reset HEAD~



So now I should have a perfect clone from about a month ago.

Considering that I got 100s of conflicts from my last attempt at git pull --rebase, what are the steps I should take to update from this point ?

What are the steps I should take to update after creating other branches and commiting changes to them ?

It might be helpful to right the steps as 1)…2)…3)…etc

I cloned Blender’s repository all over again and, after waiting for another remote commit to get commited, ran the commands:

git pull --rebase 
git submodule foreach --recursive git pull --rebase origin master

Everything, now, is updating without any conflicts. I have NO idea why my first clone was causing such problems. I’m pretty sure it was an exact clone. Oh well, problem solved for now.