| From: | Susan Douglas <susan(dot)douglas(at)enterprisedb(dot)com> |
|---|---|
| To: | Dave Page <dave(dot)page(at)enterprisedb(dot)com> |
| Cc: | Ashesh Vashi <ashesh(dot)vashi(at)enterprisedb(dot)com>, Akshay Joshi <akshay(dot)joshi(at)enterprisedb(dot)com>, pgadmin-hackers <pgadmin-hackers(at)postgresql(dot)org> |
| Subject: | Re: Compressed version of patch |
| Date: | 2016-05-27 14:59:35 |
| Message-ID: | 2C9062A3-4185-4CC5-BB12-1626EB05C802@enterprisedb.com |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgadmin-hackers |
> On May 27, 2016, at 10:02 AM, Dave Page <dave(dot)page(at)enterprisedb(dot)com> wrote:
>
> Hi
>
> On Fri, May 27, 2016 at 2:44 PM, Susan Douglas
> <susan(dot)douglas(at)enterprisedb(dot)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
| Attachment | Content-Type | Size |
|---|---|---|
| pgAdmin_doc3_upd.patch.zip | application/zip | 1.4 MB |
| unknown_filename | text/plain | 207 bytes |
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Dave Page | 2016-05-27 15:48:15 | Re: Patch for pgAdmin4 package on Mac OS X |
| Previous Message | Murtuza Zabuawala | 2016-05-27 14:04:10 | PATCH:Treeview item sorting (pgAdmin4) |