Re: [translations] snippets in LM

[Federico Bruni <fedelogy@xxxxxxxxx>]

Il giorno dom, 10/07/2011 alle 11.45 +0200, Francisco Vila ha scritto:
> The problem with 0001 looks trivial but it takes time to fix it. The
> only problem is that your patch applies to a version of the snippets
> that has a blank line removed right after the lsrtags="" line.
> 
> Just make another one after pulling from translation branch.  If you
> really want to ease Carl's life, please make a patch that applies
> cleanly on the stable/2.14 branch. 

I've run git pull and edited all the conflicting files, but now Git is
messed up completely.
What should I do?


$ git status
# On branch lilypond/translation
# Your branch and 'origin/lilypond/translation' have diverged,
# and have 2 and 132 different commit(s) each, respectively.
#
# Changes to be committed:
#
#	modified:   Documentation/changes.tely
#	modified:   Documentation/contributor.texi
#	modified:   Documentation/contributor/administration.itexi
#	modified:   Documentation/contributor/build-notes.itexi
#	modified:   Documentation/contributor/doc-work.itexi
#	new file:   Documentation/contributor/feta-font.itexi
#	modified:   Documentation/contributor/introduction.itexi
#	modified:   Documentation/contributor/issues.itexi
#	modified:   Documentation/contributor/lsr-work.itexi
#	modified:   Documentation/contributor/programming-work.itexi
#	modified:   Documentation/contributor/quick-start.itexi
#	modified:   Documentation/contributor/regressions.itexi
#	modified:   Documentation/contributor/release-work.itexi
#	modified:   Documentation/contributor/source-code.itexi
#	modified:   Documentation/contributor/website-work.itexi
#	modified:   Documentation/cs/web/download.itexi
#	modified:   Documentation/de/learning.tely
#	modified:   Documentation/de/usage/external.itely
#	modified:   Documentation/de/web.texi
#	modified:   Documentation/de/web/download.itexi
#	modified:   Documentation/de/web/introduction.itexi
#	modified:   Documentation/de/web/manuals.itexi
#	modified:   Documentation/es/GNUmakefile
#	modified:   Documentation/es/changes.tely
#	modified:   Documentation/es/included/generating-output.itexi
#	modified:   Documentation/es/learning/tweaks.itely
#	modified:   Documentation/es/notation/input.itely
#	modified:   Documentation/es/notation/keyboards.itely
#	modified:   Documentation/es/notation/staff.itely
#	modified:   Documentation/es/web/news-front.itexi
#	modified:   Documentation/hu/GNUmakefile
#	new file:   Documentation/hu/usage/lilypond-book.itely
#	modified:   Documentation/hu/web/download.itexi
#	modified:   Documentation/hu/web/manuals.itexi
#	modified:   Documentation/included/authors.itexi
#	modified:   Documentation/included/compile.itexi
#	modified:   Documentation/included/generating-output.itexi
#	modified:   Documentation/learning/tweaks.itely
#	modified:   Documentation/notation/input.itely
#	modified:   Documentation/notation/keyboards.itely
#	modified:   Documentation/notation/pitches.itely
#	modified:   Documentation/notation/simultaneous.itely
#	modified:   Documentation/notation/staff.itely
#	modified:   Documentation/pictures/Learning_Macos_welcome.png
#	modified:   Documentation/search-box.ihtml
#	modified:   Documentation/snippets/accordion-discant-symbols.ly
#	modified:
Documentation/snippets/adding-bar-lines-to-chordnames-context.ly
#	modified:   Documentation/snippets/adding-drum-parts.ly
#	modified:
Documentation/snippets/adding-indicators-to-staves-which-get-split-after-a-break.ly
#	modified:   Documentation/snippets/ancient-fonts.ly
#	modified:   Documentation/snippets/chords.snippet-list
#	modified:   Documentation/snippets/creating-double-digit-fingerings.ly
#	new file:
Documentation/snippets/cross-staff-chords---beaming-problems-workaround.ly
#	modified:
Documentation/snippets/customizing-fretboard-fret-diagrams.ly
#	modified:   Documentation/snippets/demo-midiinstruments.ly
#	modified:
Documentation/snippets/fretted-string-harmonics-in-tablature.ly
#	modified:
Documentation/snippets/hiding-the-extender-line-for-text-dynamics.ly
#	modified:   Documentation/snippets/keyboards.snippet-list
#	modified:
Documentation/snippets/new/fretted-string-harmonics-in-tablature.ly
#	modified:   Documentation/snippets/partcombine-and-autobeamoff.ly
#	modified:   Documentation/snippets/removing-the-first-empty-line.ly
#	modified:   Documentation/snippets/tweaks-and-overrides.snippet-list
#	modified:
Documentation/snippets/use-square-bracket-at-the-start-of-a-staff-group.ly
#	modified:
Documentation/snippets/using-postscript-to-generate-special-note-head-shapes.ly
#	modified:   Documentation/web/download.itexi
#	modified:   Documentation/web/news-front.itexi
#	modified:   Documentation/web/server/lilypond.org.htaccess
#	modified:   VERSION
#	modified:   configure.in
#	new file:   input/regression/beam-skip.ly
#	new file:   input/regression/breathing-sign-custom-staff.ly
#	new file:   input/regression/cue-clef-after-barline.ly
#	new file:   input/regression/cue-clef-keysignature.ly
#	new file:   input/regression/cue-clef-manually.ly
#	modified:   input/regression/event-listener-output.ly
#	new file:   input/regression/glissando-broken-multiple.ly
#	new file:   input/regression/multi-measure-rest-standard.ly
#	new file:   input/regression/multi-measure-rest-tweaks.ly
#	deleted:    input/regression/multi-measure-rest-usebreve.ly
#	modified:   input/regression/page-breaking-min-distance2.ly
#	modified:   input/regression/stanza-number.ly
#	new file:   input/regression/text-spanner-full-rest.ly
#	new file:   input/regression/tuplet-number-outside-staff-priority.ly
#	modified:   lily/align-interface.cc
#	modified:   lily/beam.cc
#	modified:   lily/breathing-sign.cc
#	modified:   lily/completion-note-heads-engraver.cc
#	modified:   lily/key-engraver.cc
#	modified:   lily/line-spanner.cc
#	modified:   lily/multi-measure-rest-engraver.cc
#	modified:   lily/multi-measure-rest.cc
#	modified:   lily/page-layout-problem.cc
#	modified:   lily/parser.yy
#	modified:   lily/pitch.cc
#	modified:   lily/simple-spacer.cc
#	modified:   lily/slur-configuration.cc
#	modified:   lily/spanner.cc
#	modified:   lily/spring.cc
#	modified:   lily/text-spanner-engraver.cc
#	modified:   lily/tie-engraver.cc
#	modified:   lily/tuplet-number.cc
#	modified:   ly/event-listener.ly
#	modified:   ly/predefined-guitar-fretboards.ly
#	modified:   mf/feta-braces.mf
#	modified:   python/convertrules.py
#	modified:   python/fontextract.py
#	modified:   python/lilylib.py
#	modified:   python/musicxml.py
#	modified:   python/rational.py
#	modified:   scm/define-grob-properties.scm
#	modified:   scm/define-grobs.scm
#	modified:   scm/define-music-properties.scm
#	modified:   scm/music-functions.scm
#	modified:   scm/output-lib.scm
#	modified:   scripts/auxiliar/lily-git.tcl
#	modified:   scripts/auxiliar/makelsr.py
#	modified:   scripts/build/create-weblinks-itexi.py
#	modified:   scripts/build/website_post.py
#	modified:   scripts/lilymidi.py
#	modified:   scripts/musicxml2ly.py
#	modified:   stepmake/stepmake/metafont-rules.make
#	modified:   stepmake/stepmake/texinfo-rules.make
#	new file:   tex/txi-hu.tex
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	both modified:
Documentation/snippets/ancient-notation-template----modern-transcription-of-gregorian-music.ly
#	both modified:
Documentation/snippets/ancient-notation-template----modern-transcription-of-mensural-music.ly
#	both modified:      Documentation/snippets/hymn-template.ly
#	both modified:      Documentation/snippets/jazz-combo-template.ly
#	both modified:
Documentation/snippets/orchestra,-choir-and-piano-template.ly
#	both modified:      Documentation/snippets/piano-template-simple.ly
#	both modified:
Documentation/snippets/piano-template-with-centered-lyrics.ly
#	both modified:
Documentation/snippets/piano-template-with-melody-and-lyrics.ly
#	both modified:
Documentation/snippets/single-staff-template-with-notes,-lyrics,-and-chords.ly
#	both modified:
Documentation/snippets/single-staff-template-with-notes-and-chords.ly
#	both modified:
Documentation/snippets/single-staff-template-with-notes-and-lyrics.ly
#	both modified:
Documentation/snippets/single-staff-template-with-only-notes.ly
#	both modified:
Documentation/snippets/string-quartet-template-simple.ly
#	both modified:
Documentation/snippets/string-quartet-template-with-separate-parts.ly
#	both modified:
Documentation/snippets/vocal-ensemble-template-with-lyrics-aligned-below-and-above-the-staves.ly
#