Feature: git merge --continue command

Question

Feature: git merge --continue command

juninho2410 opened this issue 6 years ago · comments

What's this issue all about?

Feature request for adding git merge --continue command.

I didn't find this in the command list.
I miss the last part of merge process in a conflict resolution that is the --continue command.
Would be nice if this step could be done through the interface click or command(to avoid using terminal).
I don't know if this could be in this plugin or should be in the VS Code editor.
Thanks

Shahar Kazaz · Answer 1 · Wed Feb 21 2018 15:05:25 GMT+0800 (China Standard Time)

I will look into it and see what can be done 👍 Thanks for the feedback

Shahar Kazaz · Answer 2 · Mon Mar 26 2018 18:53:26 GMT+0800 (China Standard Time)

@juninho2410 hopefully this will be done this next week/ 2 weeks 😃

juninho2410 · Answer 3 · Mon Mar 26 2018 20:24:35 GMT+0800 (China Standard Time)

Wow, really nice!🙂

Shahar Kazaz · Answer 4 · Wed Apr 11 2018 01:11:38 GMT+0800 (China Standard Time)

The dev on this feature is done, now just testing and then releasing it on v0.4.0 🎉

Shahar Kazaz · Answer 5 · Fri Apr 13 2018 22:43:33 GMT+0800 (China Standard Time)

Released! try to use it and update if you have any issues with it! Thanks for the feedback! 🎉

juninho2410 · Answer 6 · Mon Apr 16 2018 07:06:29 GMT+0800 (China Standard Time)

Ok, thanks! I'll try to use! :) Obter o Outlook para Android<https://aka.ms/ghei36>

…

________________________________ From: Shahar Kazaz <notifications@github.com> Sent: Friday, April 13, 2018 11:43:34 AM To: shaharkazaz/vscode-git-merger Cc: juninho2410; Mention Subject: Re: [shaharkazaz/vscode-git-merger] Feature: git merge --continue command (#19) Closed #19<#19>. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#19 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AA3Czvhh5PUTGN41qtA0mzyCKqf_Bra_ks5toLmWgaJpZM4SM-4t>.