Daniel Tonda Castillo wrote:
> The funny thins is that before I did any pull, everything worked out
> just fine. This might be a problem due to my using cogito in ubuntu
> I'll try to compile a newer version of git and use that instead. In the
> meantime what are your suggestions?
If you don't
The funny thins is that before I did any pull, everything worked out
just fine. This might be a problem due to my using cogito in ubuntu.
I'll try to compile a newer version of git and use that instead. In the
meantime what are your suggestions?
Daniel Tonda C.
John Mandereau escribió:
Dani
Daniel Tonda Castillo wrote:
> I get a lot of merge errors, after the git-pull:
>
> git-rev-parse web/master
> 745ee84ea5b583686e53dc2628e5067492997773
> [EMAIL PROTECTED]: lilypond]$ git pull
> git://git.sv.gnu.org/lilypond.git/ web/master:web/master
> Trying really trivial in-index merge...
> e
I get a lot of merge errors, after the git-pull:
git-rev-parse web/master
745ee84ea5b583686e53dc2628e5067492997773
[EMAIL PROTECTED]: lilypond]$ git pull
git://git.sv.gnu.org/lilypond.git/ web/master:web/master
Trying really trivial in-index merge...
es/sponsor/index.html: needs merge
es/sponso
Daniel Tonda wrote:
> I'm sorry but I made a mistake concerning the title of the second mail:
> "Priority 2 Translation of web site to spanish"
>
> It was supposed to be for the:
> Priority 3 Translation of web site to spanish
>
> I attach it again just in case it went unnoticed because of the ti
I'm sorry but I made a mistake concerning the title of the second mail:
"Priority 2 Translation of web site to spanish"
It was supposed to be for the:
Priority 3 Translation of web site to spanish
I attach it again just in case it went unnoticed because of the title.
My apologies for any inconv
