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

Fetch failed #176

Closed
3 of 4 tasks
vtemian opened this issue Jan 27, 2015 · 2 comments
Closed
3 of 4 tasks

Fetch failed #176

vtemian opened this issue Jan 27, 2015 · 2 comments
Assignees
@vtemian
Labels
bug

Comments

@vtemian
Copy link
Contributor

vtemian commented Jan 27, 2015

The git repository was stuck on merging_remote branch, after the merging failed

  • update the same file in the same time
  • remove ours, edit theirs
  • edit ours, remove theirs
  • write some tests
@vtemian vtemian added the bug label May 18, 2015
@vtemian vtemian self-assigned this May 18, 2015
@vtemian vtemian added the ready label May 18, 2015
@vtemian
Copy link
Contributor Author

vtemian commented Jun 3, 2015

If we remove the file and they change it, the merge will fail. I submit a patch in pygit2 and we'll wait for it to get merged. libgit2/pygit2#533

@vtemian
Copy link
Contributor Author

vtemian commented Jun 3, 2015

If we edit the same file in the same time, we need to fetch first, otherwise the push will fail.

@vtemian vtemian closed this as completed in 29a93e3 Jun 5, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@vtemian vtemian

Labels
bug
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@vtemian