blender/blender-developer-docs
7
8
Fork 38
Code Issues 3 Pull Requests 6 Activity

Update "Commiting Test Data" section to include build bot testing #77

Merged
Alaska merged 8 commits from Alaska/blender-developer-docs:test-updates-guide into main 2024-10-07 14:56:31 +02:00
Conversation 2 Commits 8 Files Changed 1 +5 -3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4680e6182e - Show all commits

8
docs/handbook/testing/setup.md
View File

@ -179,13 +179,15 @@ git merge --ff-only add-x-tests
git push origin main
```
Preferably straight after pushing the updated tests, update
your branch of the Blender repository to point to the updated tests,
and push your Blender changes to the main branch of the Blender repo.
After pushing the updated tests, update your branch of the Blender repository
Alaska marked this conversation as resolved Outdated
Weizhen Huang commented 2024-10-02 12:53:18 +02:00
Outdated
Review
Copy Link

It's more straightforward to merge your PR from gitea, that would also close the PR.

It's more straightforward to merge your PR from gitea, that would also close the PR.
to point to the updated tests, and push your changes to the main branch of
the Blender repository, either through Gitea, or with `git`.
``` bash
cd ../..
git commit tests/data
git push me add-x-tests-blender
# Pushing changes with git
git checkout main
git merge --ff-only add-x-tests-blender
git push origin main