Skip to content

Merge pull request from @shuge #1

Closed
Closed
Merge pull request from @shuge#1

Description

@aclark4life
aclark4life
opened on Jul 24, 2012

When merging @shuge's pull request by hand, I get:


aclark@Alexs-MacBook-Pro-2:/var/folders/vl/vj43x56d67g__xkjy71tfr680000gn/T/tmpKHyS90/Pillow/ > git pull git://github.com/shuge/Pillow.git master
remote: Counting objects: 69, done.
remote: Compressing objects: 100% (34/34), done.
remote: Total 68 (delta 25), reused 57 (delta 14)
Unpacking objects: 100% (68/68), done.
From git://github.com/shuge/Pillow
 * branch            master     -> FETCH_HEAD
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Automatic merge failed; fix conflicts and then commit the result.

@shuge can you please fix and resubmit? Note Pillow has moved from the collective to python-imaging organization.

Activity

  1. aclark4life commented on Sep 8, 2012

    @aclark4life
    aclark4life
    on Sep 8, 2012
    MemberAuthor

    Going once, twice, and closed for @shuge. Please reopen if you get inspired it would be nice to have those demos.

  2. aclark4life
    closed this as completedon Sep 8, 2012
  3. wiredfool
    added a commit that references this issue on May 20, 2014

    Merge pull request #1 from wiredfool/p_rgba_transparency

    f8c5812
  4. wiredfool
    added a commit that references this issue on Jun 3, 2014

    Merge pull request #1 from hugovk/aeroaks

    4dc3dc1
  5. hugovk
    added a commit that references this issue on Jul 7, 2014

    Merge pull request #1 from hugovk/775_tests

    516d896
  6. wiredfool
    added a commit that references this issue on Oct 1, 2015

    Merge pull request #1 from radarhere/flush

    8e7cd92
  7. wiredfool
    added a commit that references this issue on Dec 7, 2015

    Merge pull request #1 from radarhere/pillow_fix_eps_gs_command

    cd12462
  8. wiredfool
    added a commit that references this issue on Nov 5, 2017

    Merge pull request #1 from hugovk/monolithlabs-animated_webp-sprintf

    8e207d5
  9. hugovk
    added a commit that references this issue on Dec 29, 2018

    Merge pull request #1 from radarhere/patch-2

    0f379a2
  10. hugovk
    added 2 commits that reference this issue on Jun 28, 2019

    Merge pull request #1 from python-pillow/master

    2f13422

    Merge pull request #1 from radarhere/gif_test

    aa5874d
  11. radarhere
    added a commit that references this issue on Nov 30, 2019

    Merge pull request #1 from radarhere/fromarray

    19a8a39
  12. hugovk
    added a commit that references this issue on Dec 12, 2019

    Merge pull request #1 from radarhere/termux

    874ca89
  13. radarhere
    added a commit that references this issue on Dec 31, 2019

    Merge pull request #1 from radarhere/exif-writing-fixes

    47513c5
  14. hugovk
    added a commit that references this issue on May 1, 2020

    Merge pull request #1 from radarhere/patch-1

    9b6e724

  15. 38 remaining items

  16. radarhere
    added a commit that references this issue on Dec 24, 2023

    Merge pull request #1 from nulano/fix-alpha-for-overlapping-glyphs

    38992f6
  17. radarhere
    added a commit that references this issue on Feb 5, 2024

    Merge pull request #1 from radarhere/grabclipboard

    1522b3f
  18. radarhere
    added a commit that references this issue on Mar 1, 2024

    Merge pull request #1 from radarhere/truncated

    6c55dff
  19. GerHobbelt
    added a commit that references this issue on Mar 18, 2024

    Merge pull request python-pillow#1 from zoofood/patch-1

    18200ae
  20. hugovk
    added a commit that references this issue on Apr 17, 2024

    Merge pull request #1 from radarhere/types/fromarray

    92dfb02
  21. hugovk
    added a commit that references this issue on May 28, 2024

    Merge pull request #1 from radarhere/imagedraw_circle

    3a34f44
  22. radarhere
    added a commit that references this issue on Jun 22, 2024

    Merge pull request #1 from radarhere/improved-xdg-dirs-support

    d50c9cc
  23. hugovk
    added a commit that references this issue on Jul 2, 2024

    Merge pull request #1 from radarhere/bug/compat/numpy1.20

    ce6fb12
  24. hugovk
    added a commit that references this issue on Jul 17, 2024

    Skip other jobs on schedule (#1)

    d83c7b3
  25. hugovk
    added a commit that references this issue on Sep 18, 2024

    Merge pull request #1 from radarhere/improve-error-messages

    3bb180a
  26. hugovk
    added a commit that references this issue on Nov 18, 2024

    Merge pull request #1 from radarhere/homebrew-isolation

    0e3eb70
  27. radarhere
    added a commit that references this issue on Nov 29, 2024

    Merge pull request #1 from radarhere/tom/bufferedio

    9fd4450
  28. mergify
    added a commit that references this issue on Apr 1, 2025

    Merge pull request #1 from radarhere/image_grab_wayland_kde

    2f67293
  29. radarhere
    added a commit that references this issue on Mar 7, 2026

    Merge pull request #1 from radarhere/usepcf

    57be9dc
  30. hugovk
    added a commit that references this issue on Jul 26, 2026

    Merge pull request #1 from radarhere/jp2-oversized-box-length

    92506df
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions