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

fatal: multiple stage entries for merged file #20

Open
szabgab opened this issue Mar 12, 2015 · 2 comments
Open

fatal: multiple stage entries for merged file #20

szabgab opened this issue Mar 12, 2015 · 2 comments

Comments

@szabgab
Copy link

szabgab commented Mar 12, 2015

I've tried git-cpan clone XML::DT and after lots of created tag messages I got many of these:

fatal: multiple stage entries for merged file 'examples' at /Users/gabor/perl5/perlbrew/perls/perl-5.20.1_WITH_THREADS/lib/site_perl/5.20.1/Git/CPAN/Patch/Command/Import.pm line 191.
@yanick
Copy link
Owner

yanick commented Apr 17, 2015

I did the same on my machine, and it works. :-/ The error you are reporting is produced by git itself. Which version of git were you running?

@szabgab
Copy link
Author

szabgab commented Apr 18, 2015 

$ git --version
git version 2.3.4

on OSX

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
2 participants
@yanick @szabgab