[Bf-committers] How Merge master changes into remote branch

[Wander Lairson Costa]

2013/11/20 Brecht Van Lommel <brechtvanlommel at pandora.be>:
> At the moment what we are advising is to rebase for local only
> branches, and merge for branches that are in the repository on
> git.blender.org, and so shared with others. When that branch is going
> to be merged into the master branch, it must be first locally rebased
> and then pushed.
>
> In fact this policy is enforced by the git server now, if you try to
> do a force push anywhere it will reject it, and if you try to do a
> merge commit to the master branch it will reject that too.
>
>

I didn't know you could configure this policy on git server. Is this a
phabricator feature?


-- 
Best Regards,
Wander Lairson Costa