and after git commit -a -m "Updated glossary": Created commit 665d34a: Updated glossary 3 files changed, 773 insertions(+), 771 deletions(-) ...~/Git/gimp-help-2> git pull --rebase Enter passphrase : First, rewinding head to replay your work on top of it... Applying Updated glossary error: patch failed: src/glossary/glossary.xml:167 error: src/glossary/glossary.xml: patch does not apply Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged .gitignore Auto-merged src/glossary/glossary.xml Is this commit OK now?? _______________________________________________ Gimp-docs mailing list Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
