This seems to be the only available option if we can't delete master. But this will create merge commit. So far we were avoiding merge commits, but it may be ok in this case. What do you guys think - is it ok to introduce merge commit to move sentry-ha-redesign to master?
On Fri, Jul 28, 2017 at 10:56 AM, Colm O hEigeartaigh <cohei...@apache.org> wrote: > Instead of deleting the branch, we could look at doing something like the > answer suggested here: > > https://stackoverflow.com/questions/2862590/how-to- > replace-master-branch-in-git-entirely-from-another-branch > > git checkout sentry-ha-redesign > git merge -s ours master > git checkout master > git merge sentry-ha-redesign > > Colm. > > > On Thu, Jul 27, 2017 at 7:50 PM, Alexander Kolbasov <ak...@cloudera.com> > wrote: > > > Hello, > > > > as we discussed earlier we need to delete current master which is now > 1.8.0 > > and create a new master from sentry-ha-redesign. > > > > Since git doesn't support remote renames, the only way to do this is to > > delete master branch, but this requires changing > > 'receive.denyDeleteCurrent' pproperty *on the server*. > > > > Is there a way to set this property either via some web interface or by > > logging to an appropriate host? > > > > - Alex > > > > > > -- > Colm O hEigeartaigh > > Talend Community Coder > http://coders.talend.com >
