[Bf-committers] make format, potential merge conflict

[Dalai Felinto]

Hi,
I was asked to elaborate a bit on why to do the merges in 3 steps.

Basically the moment you get the .clang-format changes
(2d1cce8331f3~1) any edit you do to fix merge conflicts will result in
the new style been applied. This is quite a nightmare and it can get on the way.

So merging in steps allow you to handle previous existent merge
conflicts separately from the clang-format ones, and without the new
formatting making things more complicated.

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

Em qui., 19 de mar. de 2020 às 09:42, Dalai Felinto
<dalai at blender.org> escreveu:


>
> 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.
>
> Regards,
> -Dalai-
> --------------------------------------------------------------------
> Dalai Felinto - dalai at blender.org - www.blender.org
> Blender Development Coordinator