Pull Request merge conflict API


#1

Hi!

I was wondering if there is any plan to add some kind of API to resolve merge conflicts. I’m not completely sure how that would look like but this is how I’d like to use it:

List of conflicts in pairs, something like this:

GET /pull/1/conflicts

[
  {
   "id": 1,
   "us": "the lines that cause the conflict",
   "them": "the lines that cause the conflict"
  },
  ...
]

Resolve conflicts:

PUT /pull/1/conflicts

[
  {
    "id": 1,
    "fix": "the code that solves the conflict identified by the id 1"
  }
]

I’m not sure if more people would use it or if this is already in some API, but I couldn’t find any reference neither here nor in the developer page.

Cheers,
David


#2

I am going to close this thread because I’ve determined that it is off-topic.

Please use this forum to discuss the GitHub Platform Early Access programs.

If you have feedback, questions, or suggestions about GitHub features that are not covered by the GitHub Platform Early Access programs, write in to GitHub Support.


#3