feat: Added Merge command #1540
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
JohnstonCode
reviewed
Nov 1, 2021
src/commands/merge.ts
Outdated
|
|
||
| async merge(repository: Repository, branch: IBranchItem) { | ||
| let reintegrate = false; | ||
| if (repository.currentBranch == "trunk") { |
There was a problem hiding this comment.
This will not work for people that don't call their main branch trunk
There was a problem hiding this comment.
Line 9 in d7b26e6
There was a problem hiding this comment.
Good point. Added a isTrunk function to branches, that uses the same logic as in getBranchName.
Handle different main branches that are not called trunk.
JohnstonCode
requested changes
Nov 1, 2021
In other branches information about the error is always already outputed
JohnstonCode
approved these changes
Nov 8, 2021
|
fixes #618 |
Closed
|
@MrLalelu thanks for your work on this! |
JohnstonCode
added a commit
that referenced
this pull request
Nov 8, 2021
# [2.15.0](v2.14.0...v2.15.0) (2021-11-08) ### Features * Added Merge command ([#1540](#1540)) ([87060b3](87060b3))
|
🎉 This PR is included in version 2.15.0 🎉 The release is available on: Your semantic-release bot 📦🚀 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As I (and other #618) was looking for this feature for quite a while now, I just drafted it. I am not typescript, vscode & svn expert so am really happy for any improvement ideas.