Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set Unity yamlmergetool as a custom merge tool in Rider #948

Closed
van800 opened this issue Dec 5, 2018 · 2 comments
Closed

Set Unity yamlmergetool as a custom merge tool in Rider #948

van800 opened this issue Dec 5, 2018 · 2 comments
Milestone
Rider 2020.2

Comments

@van800
Copy link
Contributor

van800 commented Dec 5, 2018 •
edited
Loading

https://docs.unity3d.com/Manual/SmartMerge.html

  1. Currently it can be setup manually via "external merge tool" setting in Rider, but it should use the merge tool from current detected Unity version.
  2. Most of the times yamlmergetool does the job, but sometimes it needs to fallback to different mergetool, which can be rider again called as rider64.exe merge $LOCAL $REMOTE $BASE $MERGED.

Full discussion on slack https://unitydevs.slack.com/archives/CD238E69E/p1544020282007900
@van800
Copy link
Contributor Author

van800 commented Feb 6, 2019

May be worth doing after https://youtrack.jetbrains.com/issue/IDEA-200628 is fixed.

@citizenmatt
Copy link
Member

Fixed with #1682

@citizenmatt citizenmatt added this to the Rider 2020.2 milestone Oct 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Rider 2020.2
Development

No branches or pull requests
2 participants
@citizenmatt @van800