merge-branch icon indicating copy to clipboard operation
merge-branch copied to clipboard

A GitHub Action that merge PR branch to other branchs

Results 16 merge-branch issues
Sort by recently updated
recently updated
newest added

Hey there! Any chance to add a flag to decide what branch to take when conflicts are happening. We want to have different versions for different branches, but we cant...

Hi, i'm looking for a way to mirror the same author and commit message onto the target branch? is such a thing feasible and is that in your release pipeline?

I was experiencing a situation where this github action was polluting my commit log with empty commits because it merges fast forwards with no file changes.. ![image](https://user-images.githubusercontent.com/409265/151109545-24a53bf3-1c83-4bcf-9af8-da84b1898e60.png) This pull request...

hey, sometimes I'm getting this error during the merge phase: `Run devmasx/merge-branch@master with: type: now from_branch: release target_branch: metadata github_token: ***` `/usr/local/bundle/gems/octokit-4.14.0/lib/octokit/response/raise_error.rb:16:in "on_complete": POST https://api.github.com/repos/ORG/REPO/merges: 409 - Merge conflict //...

I want to know if it's possible if we can avoid creating merge commit and do a fast forward with some option. Right now it creates two commits e.g. https://github.com/piyushchauhan2011/bug-free-palm-tree/commits/staging

I'd like to implement this in our "read the docs" repository where contributors contribute PRs from their personal (public) forks. My goal is to auto merge labeled PRs into a...

Can't use latest version 1.4.0 in my gh action. Throws error. Using ``` name: Merge branch uses: devmasx/[email protected] ```

Found out that workflows by GitHub actions using a GitHub token don't trigger other workflows (due to concern of infinite loop). Is it as simple as swapping to my PAT...

I ran into an issue that seems to be a combination of two factors: 1. In my GitHub Action I have to depend on a `master` version, because depending on...

We found that it is not raised error from merge-branch action when target_branch and label_name are empty strings. When we set empty strings to the target_branch in yaml file and...