Change merge rule to require branches up to date but do not require a…

Change merge rule to require branches up to date but do not require a… #1333