We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent b660e99 commit 6df6e79Copy full SHA for 6df6e79
BLENDER_README.md
@@ -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