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

xx uncommitted changes would be overwritten by merge，how can we get the conflict files #421

Open
Devying opened this issue Jan 24, 2018 · 0 comments
Open

xx uncommitted changes would be overwritten by merge，how can we get the conflict files #421

Devying opened this issue Jan 24, 2018 · 0 comments

Comments

@Devying
Copy link

Devying commented Jan 24, 2018

using the git2go we can achieve a fuction like git pull , but when a conflict occurred，we got the error message 2 uncommitted changes would be overwritten by merge.

Now , I want to get the conflict files，what should I do?
@Devying Devying changed the title xx uncommitted changes would be overwritten by merge xx uncommitted changes would be overwritten by merge，how can we get the conflict files Jan 24, 2018
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
@Devying