Re: Priority 3 Translation spanish, was: Priority 2 Translation of web site to spanish

[Daniel Tonda Castillo]

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ó:
> Daniel Tonda Castillo wrote:
>   
> > I get a lot of merge errors, after the git-pull:
> >
> > git-rev-parse web/master
> > 745ee84ea5b583686e53dc2628e5067492997773
> > address@hidden: 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/sponsor/options.html: needs merge
> > es/switch/howto.html: needs merge
> > fatal: you need to resolve your current index first
> > Nope.
> > Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773
> > Merging:
> > afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message
> > 745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with 
> > address@hidden:/srv/git/lilypond.git#web/master
> > found 1 common ancestor(s):
> > ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of 
> > git://git.sv.gnu.org/lilypond into web/master
> > git-read-tree: fatal: you need to resolve your current index first
> >  
> > No merge strategy handled the merge.
> >
> > git-rev-list shows one thing, and git-rev-parse another:
> >
> > git-rev-list HEAD | head -1
> > afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f
> >
> >
> > git-rev-parse web/master
> > 745ee84ea5b583686e53dc2628e5067492997773
> >
> > Which would be the best way to handle this?
> >
> > Should I just start over?
> >     
>
>   
Before the pull and as the last thing, I did the commit -m with no files 
and got the vim edition of which files would be commited, etc. So I 
commented thos to be committed (in the es/ directory) and saved the 
file. git-status didn't show any uncommitted files after that.
> Did you have any uncommitted local changes before merging? i.e. did
> "git status" complained about "Changed but not updated" files?
>
> If not, that's already a good thing. Then, for each file git-pull
> reported a conflict about, open it in a text editor, go to the conflict
> zones (marked with <<<, === and >>>), merge the 2 versions manually,
> junk any conflict mark and save the file, then run "git update-index" on
> this file. After all that, commit and the merge should be complete.
>
> However, it seems according to git-pull output that you haven't
> committed files in es/sponsor/; you should add them or run
> git-update-index on them before resolving other conflicts.
>
> Try to report the result of your experiments. It might work better than
> restarting from scratch.
>   
Here's the output of the git-pull:

Ok, here goes a session of git:

git pull git://git.sv.gnu.org/lilypond.git/ web/master:web/master

Trying really trivial in-index merge...
fatal: Untracked working tree file '.gitignore' would be overwritten by 
merge.
Nope.
Merging HEAD with 745ee84ea5b583686e53dc2628e5067492997773
Merging:
afcbb4ac3dc6a31f371182da9c0b47cd2ca3b68f message
745ee84ea5b583686e53dc2628e5067492997773 Resolving conflicts with 
address@hidden:/srv/git/lilypond.git#web/master
found 1 common ancestor(s):
ac5da2c7e90f10ce8a680b275d1e33b10462c4ea Merge branch 'web/master' of 
git://git.sv.gnu.org/lilypond into web/master
git-read-tree: fatal: Untracked working tree file '.gitignore' would be 
overwritten by merge.

No merge strategy handled the merge.

===================================
Now git-status reports this:

#
# Updated but not checked in:
#   (will commit)
#
#    deleted:  .gitignore
#    deleted:  GNUmakefile
#    deleted:  README
#    deleted:  TRANSLATION
#    deleted:  colors.css
#    deleted:  de/about/faq.html
#    deleted:  de/about/index.html
#    deleted:  de/contact.ihtml
#    deleted:  de/index.html
#    deleted:  de/install/cygwin.html
#    deleted:  de/install/getting-started.html
#    deleted:  de/install/index.html
#    deleted:  de/install/macos.html
#    deleted:  de/install/using.html
#    deleted:  de/startevim.sh
#    deleted:  de/switch/advantages.html
#    deleted:  de/switch/howto.html
#    deleted:  de/switch/index.html
#    deleted:  de/switch/testimonials.html
#    deleted:  de/switch/tour.html
#    deleted:  es/about/automated-engraving/applications.html
#    deleted:  es/about/automated-engraving/benchmarking.html
#    deleted:  es/about/automated-engraving/big-page.html
#    deleted:  es/about/automated-engraving/conclusion.html
#    deleted:  es/about/automated-engraving/divide-and-conquer.html
#    deleted:  es/about/automated-engraving/engraving.html
#    deleted:  es/about/automated-engraving/formatting-architecture.html
#    deleted:  es/about/automated-engraving/implementing-notation.html
#    deleted:  es/about/automated-engraving/implementing-typography.html
#    deleted:  es/about/automated-engraving/index.html
#    deleted:  es/about/automated-engraving/input-format.html
#    deleted:  es/about/automated-engraving/introduction.html
#    deleted:  es/about/automated-engraving/problem-statement.html
#    deleted:  es/about/automated-engraving/schubert.html
#    deleted:  es/about/automated-engraving/scoring-esthetics.html
#    deleted:  es/about/automated-engraving/software.html
#    deleted:  es/about/automated-engraving/typography-features.html
#    deleted:  es/about/browser-language.html
#    deleted:  es/about/faq.html
#    deleted:  es/about/features.html
#    deleted:  es/about/index.html
#    deleted:  es/about/pubs.html
#    deleted:  es/about/thanks.html
#    deleted:  es/contact.ihtml
#    deleted:  es/documentation.html
#    deleted:  es/index.html
#    deleted:  es/install/cygwin.html
#    deleted:  es/install/getting-started.html
#    deleted:  es/install/index.html
#    deleted:  es/install/macos.html
#    deleted:  es/install/using.html
#    deleted:  es/sponsor/index.html
#    deleted:  es/sponsor/natura.html
#    deleted:  es/sponsor/options.html
#    deleted:  es/switch/advantages.html
#    deleted:  es/switch/howto.html
#    deleted:  es/switch/index.html
#    deleted:  es/switch/testimonials.html
#    deleted:  es/switch/tour.html
#    deleted:  fr/about/automated-engraving/benchmarking.html
#    deleted:  fr/about/automated-engraving/conclusion.html
#    deleted:  fr/about/automated-engraving/divide-and-conquer.html
#    deleted:  fr/about/automated-engraving/engraving.html
#    deleted:  fr/about/automated-engraving/formatting-architecture.html
#    deleted:  fr/about/automated-engraving/implementing-notation.html
#    deleted:  fr/about/automated-engraving/implementing-typography.html
#    deleted:  fr/about/automated-engraving/index.html
#    deleted:  fr/about/automated-engraving/input-format.html
#    deleted:  fr/about/automated-engraving/introduction.html
#    deleted:  fr/about/automated-engraving/problem-statement.html
#    deleted:  fr/about/automated-engraving/schubert.html
#    deleted:  fr/about/automated-engraving/scoring-esthetics.html
#    deleted:  fr/about/automated-engraving/software.html
#    deleted:  fr/about/automated-engraving/typography-features.html
#    deleted:  fr/about/browser-language.html
#    deleted:  fr/about/faq.html
#    deleted:  fr/about/features.html
#    deleted:  fr/about/index.html
#    deleted:  fr/about/name.html
#    deleted:  fr/about/pubs.html
#    deleted:  fr/about/thanks.html
#    deleted:  fr/contact.ihtml
#    deleted:  fr/documentation.html
#    deleted:  fr/index.html
#    deleted:  fr/install/cygwin.html
#    deleted:  fr/install/getting-started.html
#    deleted:  fr/install/index.html
#    deleted:  fr/install/macos.html
#    deleted:  fr/install/using.html
#    deleted:  fr/sponsor/index.html
#    deleted:  fr/sponsor/natura.html
#    deleted:  fr/sponsor/options.html
#    deleted:  fr/switch/advantages.html
#    deleted:  fr/switch/howto.html
#    deleted:  fr/switch/index.html
#    deleted:  fr/switch/new-notation.html
#    deleted:  fr/switch/testimonials.html
#    deleted:  fr/switch/tour.html
#    deleted:  newweb.css
#    deleted:  nl/about/browser-language.html
#    deleted:  nl/about/index.html
#    deleted:  nl/contact.ihtml
#    deleted:  nl/index.html
#    deleted:  nl/install/cygwin.html
#    deleted:  nl/install/getting-started.html
#    deleted:  nl/install/macos.html
#    deleted:  nl/install/using.html
#    deleted:  nl/switch/advantages.html
#    deleted:  nl/switch/howto.html
#    deleted:  nl/switch/index.html
#    deleted:  nl/switch/tour.html
#    deleted:  po/fr.po
#    deleted:  po/newweb.pot
#    deleted:  po/nl.po
#    deleted:  scripts/add-revision.py
#    deleted:  scripts/aqua-pill-button.scm
#    deleted:  scripts/big-page.py
#    deleted:  scripts/check-translation.py
#    deleted:  scripts/dump-lily-web.sh
#    deleted:  scripts/format-page.py
#    deleted:  scripts/lily-button.scm
#    deleted:  scripts/rev-to-commit.py
#    deleted:  scripts/translate.py
#    deleted:  scripts/versiondb.py
#    deleted:  site/about/automated-engraving/benchmarking.html
#    deleted:  site/about/automated-engraving/conclusion.html
#    deleted:  site/about/automated-engraving/divide-and-conquer.html
#    deleted:  site/about/automated-engraving/engraving.html
#    deleted:  site/about/automated-engraving/formatting-architecture.html
#    deleted:  site/about/automated-engraving/implementing-notation.html
#    deleted:  site/about/automated-engraving/implementing-typography.html
#    deleted:  site/about/automated-engraving/index.html
#    deleted:  site/about/automated-engraving/input-format.html
#    deleted:  site/about/automated-engraving/introduction.html
#    deleted:  site/about/automated-engraving/menu-entries.py
#    deleted:  site/about/automated-engraving/problem-statement.html
#    deleted:  site/about/automated-engraving/schubert.html
#    deleted:  site/about/automated-engraving/scoring-esthetics.html
#    deleted:  site/about/automated-engraving/software.html
#    deleted:  site/about/automated-engraving/typography-features.html
#    deleted:  site/about/browser-language.html
#    deleted:  site/about/faq.html
#    deleted:  site/about/features.html
#    deleted:  site/about/fuga.ly
#    deleted:  site/about/fuga.png
#    deleted:  site/about/index.html
#    deleted:  site/about/menu-entries.py
#    deleted:  site/about/name.html
#    deleted:  site/about/pubs.html
#    deleted:  site/about/screech-boink.png
#    deleted:  site/about/song.ly
#    deleted:  site/about/thanks.html
#    deleted:  site/announce-v2.0.html
#    deleted:  site/announce-v2.10.html
#    deleted:  site/announce-v2.2.html
#    deleted:  site/announce-v2.4.html
#    deleted:  site/announce-v2.6.html
#    deleted:  site/announce-v2.8.html
#    deleted:  site/contact.ihtml
#    deleted:  site/devel/index.html
#    deleted:  site/devel/menu-entries.py
#    deleted:  site/devel/misc/conferences.html
#    deleted:  site/devel/misc/etfformat.html
#    deleted:  site/devel/misc/index.html
#    deleted:  site/devel/misc/links.html
#    deleted:  site/devel/misc/menu-entries.py
#    deleted:  site/devel/notation/accidentals.html
#    deleted:  site/devel/notation/appogiatura.html
#    deleted:  site/devel/notation/bassocontinuo.html
#    deleted:  site/devel/notation/colors.html
#    deleted:  site/devel/notation/index.html
#    deleted:  site/devel/notation/ligature.html
#    deleted:  site/devel/notation/menu-entries.py
#    deleted:  site/devel/packaging.html
#    deleted:  site/devel/participating/bug-meister.html
#    deleted:  site/devel/participating/bugs.html
#    deleted:  site/devel/participating/build-meister.html
#    deleted:  site/devel/participating/call-for-help.html
#    deleted:  site/devel/participating/code-janitor.html
#    deleted:  site/devel/participating/cvs.html
#    deleted:  site/devel/participating/documentation-adding.html
#    deleted:  site/devel/participating/documentation-editor.html
#    deleted:  site/devel/participating/editors.html
#    deleted:  site/devel/participating/feature-page.html
#    deleted:  site/devel/participating/implementation-documenter.html
#    deleted:  site/devel/participating/index.html
#    deleted:  site/devel/participating/localization.html
#    deleted:  site/devel/participating/lsr.html
#    deleted:  site/devel/participating/menu-entries.py
#    deleted:  site/devel/participating/newsletter-editor.html
#    deleted:  site/devel/participating/release-meister.html
#    deleted:  site/devel/participating/standards.html
#    deleted:  site/devel/participating/translation.html
#    deleted:  site/documentation.html
#    deleted:  site/graphics/annotate-example-1.png
#    deleted:  site/graphics/annotate-example-1.svg
#    deleted:  site/graphics/annotate-example-2.png
#    deleted:  site/graphics/annotate-example-2.svg
#    deleted:  site/graphics/annotate-example-lead.png
#    deleted:  site/graphics/annotate-example-lead.svg
#    deleted:  site/graphics/annotate-example-parts.png
#    deleted:  site/graphics/annotate-example-parts.svg
#    deleted:  site/graphics/annotate-example-score.png
#    deleted:  site/graphics/annotate-example-score.svg
#    deleted:  site/graphics/annotate-example-single-part.png
#    deleted:  site/graphics/annotate-example-single-part.svg
#    deleted:  site/graphics/annotated-demo.svg
#    deleted:  site/images/FISL7-slides.pdf
#    deleted:  site/images/annotated-typography-144dpi.png
#    deleted:  site/images/annotated-typography.pdf
#    deleted:  site/images/autopackage-logo.png
#    deleted:  site/images/bach-schenker.png
#    deleted:  site/images/baer-flat-bw.png
#    deleted:  site/images/baer-flat-gray.png
#    deleted:  site/images/baer-ledger.png
#    deleted:  site/images/baer-sarabande.png
#    deleted:  site/images/baer-suite1-fullpage.png
#    deleted:  site/images/baer-suite1-line.png
#    deleted:  site/images/bare-typography-144dpi.png
#    deleted:  site/images/beam-scoring-example.png
#    deleted:  site/images/bench-morgenlied.png
#    deleted:  site/images/black.png
#    deleted:  site/images/bug-face-openphoto-teun.jpeg
#    deleted:  site/images/carter-brey.jpeg
#    deleted:  site/images/cello-blonde-flickr-sillygwailo.jpeg
#    deleted:  site/images/computer-totaal.jpeg
#    deleted:  site/images/cygwin-shot.png
#    deleted:  site/images/cygwin.png
#    deleted:  site/images/daemon.png
#    deleted:  site/images/darius-blasband.jpeg
#    deleted:  site/images/deb-logo.png
#    deleted:  site/images/debian-logo.png
#    deleted:  site/images/digital-tradition.png
#    deleted:  site/images/directions-updown.png
#    deleted:  site/images/double-lily.png
#    deleted:  site/images/engraver-acc.png
#    deleted:  site/images/engraver-beam.png
#    deleted:  site/images/engraver-clef.png
#    deleted:  site/images/engraver-final.png
#    deleted:  site/images/engraver-noteheads.png
#    deleted:  site/images/engraver-polyphony.png
#    deleted:  site/images/engraver-score.png
#    deleted:  site/images/engraver-slur.png
#    deleted:  site/images/engraver-staff.png
#    deleted:  site/images/engraver-stem.png
#    deleted:  site/images/example-1.png
#    deleted:  site/images/example-2.png
#    deleted:  site/images/example-lead.png
#    deleted:  site/images/example-score.png
#    deleted:  site/images/example-singlepart.png
#    deleted:  site/images/fedora-logo.png
#    deleted:  site/images/finale-beam-detail.png
#    deleted:  site/images/finale-flat-correct.png
#    deleted:  site/images/finale-flat-detail.png
#    deleted:  site/images/finale-sarabande-full.png
#    deleted:  site/images/fink.png
#    deleted:  site/images/flat-design.png
#    deleted:  site/images/floating.png
#    deleted:  site/images/fuga-fragment.png
#    deleted:  site/images/gentoo-logo.png
#    deleted:  site/images/give-labs.png
#    deleted:  site/images/grenade-hanwen.jpeg
#    deleted:  site/images/guile-logo.jpeg
#    deleted:  site/images/haddad-poetik3.png
#    deleted:  site/images/hader-collage.jpeg
#    deleted:  site/images/hader-slaan.jpeg
#    deleted:  site/images/henle-flat-bw.png
#    deleted:  site/images/henle-flat-gray.png
#    deleted:  site/images/henle-ledger.png
#    deleted:  site/images/henle-suite1-fullpage.png
#    deleted:  site/images/henle-suite1-line.png
#    deleted:  site/images/lelie.png
#    deleted:  site/images/les-nereides.png
#    deleted:  site/images/lily-flat-bw.png
#    deleted:  site/images/lily-in-inkscape.png
#    deleted:  site/images/lily-ledger.png
#    deleted:  site/images/lily14-sarabande-correct.png
#    deleted:  site/images/lily14-sarabande.png
#    deleted:  site/images/lily17-sarabande.png
#    deleted:  site/images/lilypond-book-small.png
#    deleted:  site/images/lilypond-book.png
#    deleted:  site/images/linux-audio-developers.jpeg
#    deleted:  site/images/lisplogo_warning_128.png
#    deleted:  site/images/lj-cover140-small.png
#    deleted:  site/images/lj-cover140.png
#    deleted:  site/images/macosx-logo.png
#    deleted:  site/images/mandrake-logo.png
#    deleted:  site/images/mc-squared-stem-thick.png
#    deleted:  site/images/mc-squared.png
#    deleted:  site/images/monet-fragment.jpeg
#    deleted:  site/images/morgenlied-crop-2.jpeg
#    deleted:  site/images/morgenlied-ly-crop2.png
#    deleted:  site/images/mutopia.png
#    deleted:  site/images/naive-notation-uml.png
#    deleted:  site/images/naive-notation.png
#    deleted:  site/images/nereid-shot-small.png
#    deleted:  site/images/nereid-shot.png
#    deleted:  site/images/netbsd-logo.png
#    deleted:  site/images/nonnaive-notation.png
#    deleted:  site/images/openbsd-logo.png
#    deleted:  site/images/orm-finnendahl.jpeg
#    deleted:  site/images/proportional-fragment.png
#    deleted:  site/images/redhat-logo.png
#    deleted:  site/images/ross-beam-scan.jpeg
#    deleted:  site/images/sarabande.png
#    deleted:  site/images/schumann.png
#    deleted:  site/images/screenshot-macos.png
#    deleted:  site/images/shortcut.png
#    deleted:  site/images/simple-notation.png
#    deleted:  site/images/simultaneous-0.png
#    deleted:  site/images/simultaneous-1.png
#    deleted:  site/images/simultaneous-2.png
#    deleted:  site/images/simultaneous-3.png
#    deleted:  site/images/simultaneous-page1.png
#    deleted:  site/images/slackware-logo.png
#    deleted:  site/images/slur-esthetics-annotate-1.png
#    deleted:  site/images/slur-esthetics-annotate-2.png
#    deleted:  site/images/slur-esthetics-annotate-3.png
#    deleted:  site/images/slur-esthetics.png
#    deleted:  site/images/sondag-morgen-smaller.png
#    deleted:  site/images/sondag-morgen.png
#    deleted:  site/images/spacing-no-corr.png
#    deleted:  site/images/spacing-with-corr.png
#    deleted:  site/images/stone-distance.png
#    deleted:  site/images/suse-logo.png
#    deleted:  site/images/terminal-shot.png
#    deleted:  site/images/thesis-erik-sandberg.pdf
#    deleted:  site/images/thickness-tweaks.png
#    deleted:  site/images/thicknesses-page1.png
#    deleted:  site/images/ties-scoring-example.png
#    deleted:  site/images/tools-flickr-sus.jpeg
#    deleted:  site/images/trumpet-notes-poagao.jpeg
#    deleted:  site/images/tux-logo.png
#    deleted:  site/images/ubuntu.png
#    deleted:  site/images/windows-logo.png
#    deleted:  site/images/xivcim.pdf
#    deleted:  site/index.html
#    deleted:  site/install/cygwin.html
#    deleted:  site/install/getting-started.html
#    deleted:  site/install/index.html
#    deleted:  site/install/install-2.10.ihtml
#    deleted:  site/install/install-2.11.ihtml
#    deleted:  site/install/install-2.8.ihtml
#    deleted:  site/install/macos.html
#    deleted:  site/install/menu-entries.py
#    deleted:  site/install/old.ihtml
#    deleted:  site/install/older-versions.html
#    deleted:  site/install/test.ly
#    deleted:  site/install/using.html
#    deleted:  site/menu-entries.py
#    deleted:  site/news.ihtml
#    deleted:  site/old-news.html
#    deleted:  site/search-noscript.html
#    deleted:  site/search.html
#    deleted:  site/sponsor/index.html
#    deleted:  site/sponsor/menu-entries.py
#    deleted:  site/sponsor/natura.html
#    deleted:  site/sponsor/options.html
#    deleted:  site/switch/advantages.html
#    deleted:  site/switch/example-1.ly
#    deleted:  site/switch/example-1.sodipodi
#    deleted:  site/switch/example-2.ly
#    deleted:  site/switch/example-2.sodipodi
#    deleted:  site/switch/example-lead.sodipodi
#    deleted:  site/switch/example-parts.ly
#    deleted:  site/switch/example-parts.sodipodi
#    deleted:  site/switch/example-score.sodipodi
#    deleted:  site/switch/example-single-part.sodipodi
#    deleted:  site/switch/howto.html
#    deleted:  site/switch/index.html
#    deleted:  site/switch/menu-entries.py
#    deleted:  site/switch/new-notation.html
#    deleted:  site/switch/testimonials.html
#    deleted:  site/switch/tour.html
#    deleted:  site/template.ihtml
#
#
# Untracked files:
#   (use "git add" to add to commit)
#
#    .gitignore
#    GNUmakefile
#    README
#    TRANSLATION
#    colors.css
#    de/
#    es/
#    fr/
#    newweb.css
#    nl/
#    po/
#    scripts/
#    site/

> Cheers
>   
Daniel Tonda C.

--
Educación es lo que la mayoría recibe, muchos transmiten y pocos tienen. 
-- Karl Kraus. (1874-1936) Escritor austríaco.

daniel.tonda.vcf
Description: Vcard