[Bf-committers] make format, potential merge conflict

Dalai Felinto dalai at blender.org
Thu Mar 19 09:42:08 CET 2020

Hi all,

I just committed a change to .clang-format with a following `make
format` (008aaaa37841c + 2d1cce8331f3). The change is rather small
(resorting include headers), but this will potentially cause conflicts
for bug branches.

My recommendation is to merge master before these changes, solve any
conflicts, merge the '.clang-format` change, run `make format`,
commit, and then merge the final commit.

$ git fetch
$ git merge 2d1cce8331f3~2
$ git merge 2d1cce8331f3~1
$ make format
$ git add source/blender source/creator intern tests # be sure to not
add any submodule
$ git commit -m "Cleanup: make format after SortedIncludes`
$ git merge 2d1cce8331f3~0

The conflicts themselves should be rather simple, since the only
change is re-sorting headers.

Dalai Felinto - dalai at blender.org - www.blender.org
Blender Development Coordinator

More information about the Bf-committers mailing list