[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Trouble merging line-numbers branch into master
|
From: |
Noam Postavsky |
|
Subject: |
Re: Trouble merging line-numbers branch into master |
|
Date: |
Fri, 7 Jul 2017 11:51:51 -0400 |
On Fri, Jul 7, 2017 at 11:43 AM, Kaushal Modi <address@hidden> wrote:
> Also, shouldn't that commit have been blocked in the first place instead of
> complaining about it when merging?
If you rerun './autogen git' in a checkout which includes [1:
e20ad44], the git hook should be updated such that it won't complain
about changes from merged commits anymore.
1: 2017-04-29 11:42:13 -0700 e20ad449deefa7470386bf99e05fd8c67227f678
Allow bypassing of some checks when merging