How to automate feature branch merge on to develop?

Question

Using WebStorm IDE and typical gitflow. Day by day I am do same operations after work on feature is finished:

Are there any plugins to automate this simple actions (except #5) by one button?

score 1 · Accepted Answer · answered Mar 12 '19 at 05:46

"One button": you would need to record a macro and bind a keyboard shortcut to said macro.

But that would not take into account the comment you need to enter when merging, or the potential conflict resolution.

You could also write a script, and declaring it as an external tool.
In that script, the merge step would stop if there is conflict.

1 Answers1