Francisco Vila <[email protected]> writes: > 2012/10/30 David Kastrup <[email protected]>: >> Francisco Vila <[email protected]> writes: >> >>> 2012/10/28 David Kastrup <[email protected]>: >>>> The translations for 2.16.1 are pretty much through, and I merged into >>>> master again. >>> >>> I updated Documentation/es/changes.tely for stable and committed to >>> translation branch. Then updated the same file for 2.17 (I wrongly >>> said it was for 2.16 in the commit info) and committed to staging >>> branch. This is a source of conflict, but the merge shows no conflict. >>> Why? >> >> Because in the course of back- and forward synching, it would appear >> that I already merged this change into staging before you did: > >> Hopefully, I would have resolved any conflicts correctly when doing >> that. > > Yes, it looks so. I just expected the merge commit to show what files > the conflicts were in, as usual. At the end, details about it are not > important because the result is fine.
Ok, I just repeated the identical merge: dak@lola:/usr/local/tmp/lilypond$ git checkout 6b45c18 Previous HEAD position was 8e6cd3b... Issue 2592: index entries for slides and chord glissandi HEAD is now at 6b45c18... CG: fixed wrong link to Contact in web dak@lola:/usr/local/tmp/lilypond$ git merge 11a15ac Auto-merging Documentation/it/search-box.ihtml Auto-merging Documentation/fr/notation/vocal.itely Auto-merging Documentation/fr/notation/changing-defaults.itely Auto-merging Documentation/fr/notation/ancient.itely Auto-merging Documentation/es/notation/rhythms.itely Auto-merging Documentation/es/changes.tely CONFLICT (content): Merge conflict in Documentation/es/changes.tely Automatic merge failed; fix conflicts and then commit the result. dak@lola:/usr/local/tmp/lilypond$ so it would appear that I just deleted the conflict remark in the commit message in the belief that this would have been appropriate after resolving the conflict. Since nobody expects unresolved conflicts to be committed, that was probably a mistake. I'll keep them around next time, sorry. -- David Kastrup _______________________________________________ lilypond-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/lilypond-devel
