search

shaharkazaz / vscode-git-merger

Available at vscode marketplace https://marketplace.visualstudio.com/items?itemName=shaharkazaz.git-merger
MIT License
24 stars 2 forks source link

Feature: git merge --continue command #19

Closed juninho2410 closed 6 years ago

juninho2410 commented 6 years ago

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

shaharkazaz commented 6 years ago

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

shaharkazaz commented 6 years ago

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

juninho2410 commented 6 years ago

Wow, really nice!🙂

shaharkazaz commented 6 years ago

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

shaharkazaz commented 6 years ago

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

juninho2410 commented 6 years ago

Ok, thanks! I'll try to use! :)

Obter o Outlook para Androidhttps://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 #19https://github.com/shaharkazaz/vscode-git-merger/issues/19.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://github.com/shaharkazaz/vscode-git-merger/issues/19#event-1573432398, or mute the threadhttps://github.com/notifications/unsubscribe-auth/AA3Czvhh5PUTGN41qtA0mzyCKqf_Bra_ks5toLmWgaJpZM4SM-4t.