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

Conflict marker is not removed when a conflict on a mpr file is resolved manually #2

Open
mweststrate opened this issue Jun 26, 2014 · 0 comments
Open

Conflict marker is not removed when a conflict on a mpr file is resolved manually #2

mweststrate opened this issue Jun 26, 2014 · 0 comments

Comments

@mweststrate
Copy link
Owner

If there is a conflict on a mpr file, and it is solved using git add or git checkout, the modeler will still think the file is conflicted and try to merge.

Workaround for now is to just run mxgit after git add, git checkout.
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
No milestone
Development

No branches or pull requests
1 participant
@mweststrate