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.