rgburke opened this issue 6 years ago · 0 comments
Add an action to merge another branch into the currently checked out branch. If merging fails with conflicts then switch to the Status View.
Status View
As with #66 a ref pop-up window should be displayed in order to select the appropriate ref to merge.