Обсуждение: Re: Compressed version of patch
Hi On Fri, May 27, 2016 at 2:44 PM, Susan Douglas <susan.douglas@enterprisedb.com> wrote: > Hi All, > > I meant to send that patch in a compressed format... I can't apply this, as it's trying to create a number of files that already exist in the repo. Did you do a git pull or git rebase before running git add and creating your patch? If I had to guess, this was created against the repo prior to me committing your last patch. -- Dave Page VP, Chief Architect, Tools & Installers EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company Blog: http://pgsnake.blogspot.com Twitter: @pgsnake
> On May 27, 2016, at 10:02 AM, Dave Page <dave.page@enterprisedb.com> wrote: > > Hi > > On Fri, May 27, 2016 at 2:44 PM, Susan Douglas > <susan.douglas@enterprisedb.com> wrote: >> Hi All, >> >> I meant to send that patch in a compressed format... > > I can't apply this, as it's trying to create a number of files that > already exist in the repo. Did you do a git pull or git rebase before > running git add and creating your patch? If I had to guess, this was > created against the repo prior to me committing your last patch. Can you try this one please? Thanks! -- Susan > > > -- > Dave Page > VP, Chief Architect, Tools & Installers > EnterpriseDB: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake
Вложения
On Fri, May 27, 2016 at 3:59 PM, Susan Douglas <susan.douglas@enterprisedb.com> wrote: > >> On May 27, 2016, at 10:02 AM, Dave Page <dave.page@enterprisedb.com> wrote: >> >> Hi >> >> On Fri, May 27, 2016 at 2:44 PM, Susan Douglas >> <susan.douglas@enterprisedb.com> wrote: >>> Hi All, >>> >>> I meant to send that patch in a compressed format... >> >> I can't apply this, as it's trying to create a number of files that >> already exist in the repo. Did you do a git pull or git rebase before >> running git add and creating your patch? If I had to guess, this was >> created against the repo prior to me committing your last patch. > > Can you try this one please? > > Thanks! Thanks - linked to the dialogs and applied. -- Dave Page VP, Chief Architect, Tools & Installers EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company Blog: http://pgsnake.blogspot.com Twitter: @pgsnake