Skip to content

Pull Requests who's changes have already been merged result in conflict #41

Description

@prince-chrismc

While testing #39 I noticed this with

https://api.github.com/repos/prince-chrismc/conan-center-index/pulls/22/files

[
  {
    "sha": "6390b5f44429a721fe918e8dba0e6feb8efab44f",
    "filename": "recipes/amqp-cpp/all/conandata.yml",
    "status": "modified",
    "additions": 6,
    "deletions": 0,
    "changes": 6,
    "blob_url": "https://github.com/prince-chrismc/conan-center-index/blob/6805ded7ac26b8ce6540c1c564af223f9de31bff/recipes/amqp-cpp/all/conandata.yml",
    "raw_url": "https://github.com/prince-chrismc/conan-center-index/raw/6805ded7ac26b8ce6540c1c564af223f9de31bff/recipes/amqp-cpp/all/conandata.yml",
    "contents_url": "https://api.github.com/repos/prince-chrismc/conan-center-index/contents/recipes/amqp-cpp/all/conandata.yml?ref=6805ded7ac26b8ce6540c1c564af223f9de31bff",
    "patch": "@@ -14,6 +14,9 @@ sources:\n   \"4.3.10\":\n     url: \"https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.10.tar.gz\"\n     sha256: \"4fa1e9650f7a08ae7217899431a3b3f0a173ad826dd819f0b8c760e4e2a65298\"\n+  \"4.3.11\":\n+    url: \"https://github.com/CopernicaMarketingSoftware/AMQP-CPP/archive/v4.3.11.tar.gz\"\n+    sha256: \"be2b11ada1020f77b859857310be54bd073c3a4f579d99a5e251a738576ca28c\"\n patches:\n   \"4.1.5\":\n     - patch_file: \"patches/0001-cmake-openssl-install-directories.patch\"\n@@ -30,3 +33,6 @@ patches:\n   \"4.3.10\":\n     - patch_file: \"patches/0001-cmake-openssl-install-directories.patch\"\n       base_path: \"source_subfolder\"\n+  \"4.3.11\":\n+    - patch_file: \"patches/0001-cmake-openssl-install-directories.patch\"\n+      base_path: \"source_subfolder\""
  },
  {
    "sha": "d3e2f2ec12bb96a884d34f311a24679f64566e15",
    "filename": "recipes/amqp-cpp/config.yml",
    "status": "modified",
    "additions": 2,
    "deletions": 0,
    "changes": 2,
    "blob_url": "https://github.com/prince-chrismc/conan-center-index/blob/6805ded7ac26b8ce6540c1c564af223f9de31bff/recipes/amqp-cpp/config.yml",
    "raw_url": "https://github.com/prince-chrismc/conan-center-index/raw/6805ded7ac26b8ce6540c1c564af223f9de31bff/recipes/amqp-cpp/config.yml",
    "contents_url": "https://api.github.com/repos/prince-chrismc/conan-center-index/contents/recipes/amqp-cpp/config.yml?ref=6805ded7ac26b8ce6540c1c564af223f9de31bff",
    "patch": "@@ -9,3 +9,5 @@ versions:\n     folder: all\n   \"4.3.10\":\n     folder: all\n+  \"4.3.11\":\n+    folder: all"
  }
]

https://api.github.com/repos/prince-chrismc/conan-center-index/commits/720c06d0d8ca481f0b9d03e3f42d92379da3eebd

"stats": {
  "total": 0,
  "additions": 0,
  "deletions": 0
},
"files": [

]

Metadata

Metadata

Assignees

No one assigned

    Labels

    bugSomething isn't workingneeds investigationRequires additional research

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions