3 way merge like webstorm

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

Closed ori007a closed 6 years ago

ori007a commented 6 years ago

Please add 3 way merge like webstorm! This can greatly help to a lot of people!

shaharkazaz commented 6 years ago

This is part of the roadmap but won't be out very soon, there is still a lot of dev up ahead. but keep updating 👍