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

If --3way merge fails, provide more helpful message to user #8

Closed
rconradharris opened this issue Jun 20, 2013 · 2 comments
Closed

If --3way merge fails, provide more helpful message to user #8

rconradharris opened this issue Jun 20, 2013 · 2 comments
Labels
bug
Milestone
0.3.5

Comments

@rconradharris
Copy link
Owner

Right now, if the --3way merge fails during a git-am, it drops the user back to the prompt with no information.

We should provide a more helpful error that directs them to manually apply .git/rebase-apply/patch.

Eventually it would be nice to automatically apply this patch.
@rconradharris
Copy link
Owner Author

Looks like git apply --3way < .git/rebase-apply/patch automatically fixes this case.

Seems like it works because it doesn't try to build_fake_ancestors

@rconradharris
Copy link
Owner Author

We probably want to hide the existing error and craft a new, more helpful message.

  • Hide errors from git am when merge fails, we supply our own
    • Use --resolvemsg when am fails

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
bug
Projects
None yet
Milestone
0.3.5
Development

No branches or pull requests
1 participant
@rconradharris