Consider adding a git action button for merging master into the current branch

[jamesaoverton]

The obvious problem is how to handle merge conflicts.

An alternative is to do the merge on a GitHub PR, but even then there are cases where GitHub tells you to do the merge locally.

Thoughts?

[matentzn]

No thoughts in this issue, but how difficult would it be to support github actions in droid? This could be a real alternative for the "create github release" function!

[matentzn]

Maybe for this use case here, its easier to just use Github itself (which has a reasonable conflict merge pipeline etc) rather than rebuilding the functionality in DROID?

[lmcmicu]

It seems that the GitHub API will fail with:

Status: 409 Conflict

{
  "message": "Merge Conflict"
}

in the case of a merge conflict (https://docs.github.com/en/rest/reference/repos#merge-a-branch).

If that's the case, then if you really want this feature, we could have droid attempt the merge through the API, and if it gets a merge conflict response, then droid can inform the user that (s)he needs to do the merge manually in GitHub or on the command line.

[lmcmicu]

Another possibility (which will potentially be faster) is to run git merge on the command line. I don't think there is a way to abort the merge before git attempts it, however if there is a merge conflict then there is a way to clean up and revert to the previous state by using git merge --abort. However that may have unintended consequences if there were untracked changes before the initial merge attempt.

The API-based solution seems to be the safest (though I haven't verified that it works as I think it will).