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

Try harder if am --3way fails #14

Open
rconradharris opened this issue Jul 3, 2013 · 0 comments
Open

Try harder if am --3way fails #14

rconradharris opened this issue Jul 3, 2013 · 0 comments
Labels
bug

Comments

@rconradharris
Copy link
Owner

Right now we just give up ungracefully when am --3way fails.

There might be ways to try harder on behalf of the user.

For example, git apply --3way seems to occasionally work even if an am fails (since it doesn't call build_fake_ancestors).

Placeholder for considering this.

A better solution would be to fix the underlying missing blob issue if we can figure out exactly what's going on here.
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
No milestone
Development

No branches or pull requests
1 participant
@rconradharris