如何自动进行功能分支合并以进行开发？

Question

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

1. Push feature branch to remote
2. Checkout branch develop
3. Pull develop updates from remote
4. Merge feature branch to develop
5. Stop in case of any merge-conflicts. Manually resolve conflicts.
6. Push develop to remote

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

Answer 1

"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.