Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Conversation

@thefirstofthe300
Copy link
Contributor

As I am still very new to git, I pulled a real boner and deleted the entire branch from my local and remote git repos. Permanently. (Still can't believe I did that.)

Here is the merge error fix for the issue. The change is exactly the same as request #4245.

@ghost ghost assigned TomMalbran Jul 17, 2013
@TomMalbran
Copy link
Contributor

So that was probably the problem with the merge. Ok, merging then. Thanks for the fix :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants