runas-gitflow-merge v0.1.0

Main Index:

• Available Commands
  • Steps
    • merger::merge (git flow merge)
• Plugins

Available Commands:

STEPS

merger::merge (git flow merge)

[Index]

Description

Finish step execute main functionality of finish action Runas GitFlow methology.

"merge" Strategy

With this strategy the step try to merge targetBranch into actualBranch. if is OK try to delete actualBranch. Branch to delete is emmit as deletedBranch.

If any there is any conflict stop de execution until this conflict were solved.

"pullRequest" Strategy

first try to merge locally target branch with yours and then shows this message:

IMPORTANT: Make sure your changes have been pushed before make the pullRequest manually.

********************************** READ THIS **********************************

     Create a Pull Request manually and wait for resolution by responsible

 *******************************************************************************

Note: you can change the finish strategy of any repository by adding a .runas/runas.json file like this in your repository:

{
  "params" : {
    "strategy" : "pullRequest"
  }
}

Parameters

• --strategy: String, default: merge, possibles (merge/pullRequest), establish merge strategy of the process.
• --finishTargets: Object, default see next section
• --mergerTargets: Object, default see next section

${flow}Targets - configuration

This parameter is madden by the composition of the flow name and Targets. Is possible to set as many parameters as flows you want to include this step. If this parameter is not set the step fails

By default we have configured only two flows names, finishTargets and mergeTargets

  "finishTargets": {
    "merger" : ["develop"],
    "feature" : ["develop"],
    "release" : ["master", "force"],
    "hotfix" : ["master"]
  },
  "mergeTargets": {
    "merger" : ["master"]
  }

"release" : ["master", "force"],  -> ${actualBranch} : [${targetBranch}, ((force)) ],

• actualBranch: Is the name of the actual branch.
• targetBranch: Is the name of the target branch that is going to be merged
• force: Optional: If is set the merge is going to be with Xours parameter so in case of conflict actualBranch is going to lead.

Stages

check

git fetch -p & git pull

run

git merge ${targetBranch}

if conflict & force -> git merge --abort git merge -Xours ${targetBranch}

Plugins

• runas-plugin-scm-git