Skip to content

Commit 6df6e79

Browse files
brechtvlbartvdbraak
authored andcommitted
BLENDER: Add docs explaining merge strategy
1 parent b660e99 commit 6df6e79

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

BLENDER_README.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Blender Merges
2+
3+
Currently the process for merging upstream changes is to rebase, and keep
4+
Blender modifications on top. This keeps a clear overview of the modifications
5+
that were made.
6+
7+
When merging a major new release, cherry-pick all the Blender commits on
8+
top of it. A simple `git rebase` will not work because the release and main
9+
branches diverge.
10+
11+
First do changes in `blender-merged-develop`, and deploy on uatest. Then apply
12+
the changes in `blender-merged` and deploy in production.

0 commit comments

Comments
 (0)