What I changed was the image that appears at the start of blender, just to learn things, I thought a make update would solve it but It did not, I get the following message:
Blender repository skipped: you have unstaged changes
More detail of the message:
C:>cd blender-git
C:\blender-git>cd blender
C:\blender-git\blender>make update
No explicit msvc version requested, autodetecting version.
** Visual Studio 2022 Developer Command Prompt v17.11.1
** Copyright (c) 2022 Microsoft Corporation
[vcvarsall.bat] Environment initialized for: ‘x64’
Compiler Detection successful, detected VS2022
C:\Program Files\Git\cmd\git.exe lfs install --skip-repo
Git LFS initialized.
Configuring Precompiled Libraries
Detected platform : windows
Detected architecture : x64
- Enabling precompiled libraries at lib/windows_x64
Updating Libraries
- Skipping lib\linux_x64
- Skipping lib\macos_arm64
- Skipping lib\macos_x64
- Updating lib\windows_x64 …
GIT_LFS_SKIP_SMUDGE=1 C:\Program Files\Git\cmd\git.exe submodule update --init --progress lib\windows_x64
C:\Program Files\Git\cmd\git.exe -C lib\windows_x64 lfs pull
- Skipping lib\windows_arm64
- Updating release\datafiles\assets …
GIT_LFS_SKIP_SMUDGE=1 C:\Program Files\Git\cmd\git.exe submodule update --init --progress release\datafiles\assets
C:\Program Files\Git\cmd\git.exe -C release\datafiles\assets lfs pull
- Skipping tests\data
Update finished with the following messages
Blender repository skipped: you have unstaged changes
Just to be clear I can build blender with the new image
Commit your changes to a local branch, then pull, and merge origin/main into your local branch.
Ok I learn a lot with your advice, and that is the idea, but in the end afther shearching a litle I endend using this line:
git pull --rebase --autostash
and a make update
and it aparently work
--autostash implies you have uncommitted changes, best to get into the habit of committing those.
It’ll make it easier to go back to earlier versions, nr of times, i change my code for the worse, are much further from zero than i’d like it to be, and having a “lets go back to last nights state!” card I can pull has saved my butt more than once.
Ok, I did it again
Microsoft Windows [Version 10.0.26100.2454]
(c) Microsoft Corporation. All rights reserved.
C:\Windows\System32>cd ../..
C:\>cd blender-git/blender
C:\blender-git\blender>meke update
'meke' is not recognized as an internal or external command,
operable program or batch file.
C:\blender-git\blender>make update
No explicit msvc version requested, autodetecting version.
**********************************************************************
** Visual Studio 2022 Developer Command Prompt v17.11.1
** Copyright (c) 2022 Microsoft Corporation
**********************************************************************
[vcvarsall.bat] Environment initialized for: 'x64'
Compiler Detection successful, detected VS2022
C:\Program Files\Git\cmd\git.exe lfs install --skip-repo
Git LFS initialized.
Configuring Precompiled Libraries
=================================
Detected platform : windows
Detected architecture : x64
* Enabling precompiled libraries at lib/windows_x64
Updating Libraries
==================
* Skipping lib\linux_x64
* Skipping lib\macos_arm64
* Skipping lib\macos_x64
* Updating lib\windows_x64 ...
GIT_LFS_SKIP_SMUDGE=1 C:\Program Files\Git\cmd\git.exe submodule update --init --progress lib\windows_x64
C:\Program Files\Git\cmd\git.exe -C lib\windows_x64 lfs pull
* Skipping lib\windows_arm64
* Updating release\datafiles\assets ...
GIT_LFS_SKIP_SMUDGE=1 C:\Program Files\Git\cmd\git.exe submodule update --init --progress release\datafiles\assets
C:\Program Files\Git\cmd\git.exe -C release\datafiles\assets lfs pull
* Skipping tests\data
Update finished with the following messages
===========================================
Blender repository skipped: you have unstaged changes
C:\blender-git\blender>git checkout -b new-feature
Switched to a new branch 'new-feature'
C:\blender-git\blender>git add .
C:\blender-git\blender>git commit -m "Message"
[new-feature 4d3b9e066c5] Message
1 file changed, 0 insertions(+), 0 deletions(-)
C:\blender-git\blender>git pull origin/main
fatal: 'origin/main' does not appear to be a git repository
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
C:\blender-git\blender>git pull origin main
From https://projects.blender.org/blender/blender
* branch main -> FETCH_HEAD
Already up to date.
C:\blender-git\blender>git merge origin/master
merge: origin/master - not something we can merge
C:\blender-git\blender>git merge origin master
merge: master - not something we can merge
C:\blender-git\blender>git merge origin/min
merge: origin/min - not something we can merge
C:\blender-git\blender>git merge origin/main
Already up to date.
C:\blender-git\blender>git merge origin main
Already up to date.
C:\blender-git\blender>git checkout main
Switched to branch 'main'
Your branch is up to date with 'origin/main'.
C:\blender-git\blender>make update
No explicit msvc version requested, autodetecting version.
**********************************************************************
** Visual Studio 2022 Developer Command Prompt v17.11.1
** Copyright (c) 2022 Microsoft Corporation
**********************************************************************
[vcvarsall.bat] Environment initialized for: 'x64'
Compiler Detection successful, detected VS2022
C:\Program Files\Git\cmd\git.exe lfs install --skip-repo
Git LFS initialized.
Updating Blender Git Repository
===============================
C:\Program Files\Git\cmd\git.exe pull --rebase
Already up to date.
Configuring Precompiled Libraries
=================================
Detected platform : windows
Detected architecture : x64
* Enabling precompiled libraries at lib/windows_x64
Updating Libraries
==================
* Skipping lib\linux_x64
* Skipping lib\macos_arm64
* Skipping lib\macos_x64
* Updating lib\windows_x64 ...
GIT_LFS_SKIP_SMUDGE=1 C:\Program Files\Git\cmd\git.exe submodule update --init --progress lib\windows_x64
C:\Program Files\Git\cmd\git.exe -C lib\windows_x64 lfs pull
* Skipping lib\windows_arm64
* Updating release\datafiles\assets ...
GIT_LFS_SKIP_SMUDGE=1 C:\Program Files\Git\cmd\git.exe submodule update --init --progress release\datafiles\assets
C:\Program Files\Git\cmd\git.exe -C release\datafiles\assets lfs pull
* Skipping tests\data
C:\blender-git\blender>
It worked, is there someting wrong?
oh wow…thats… a lot of typo’s… beyond the typo’s you did nothing wrong, just no-one committed any code in-between when you made your branch and when you tried to merge.
I generally don’t pull specific branches, i just run a ‘git pull’ and get everything in a single go.
1 Like