That command compares what is in your working directory with what is in your staging area. The result tells you the changes you’ve made that you haven’t yet staged. If you want to see what you’ve staged (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. Git hasn’t automatically created a new merge commit. It has paused the process while you resolve client branch as if it was based directly off the master branch instead.” It’s a bit complex, but the result is pretty cool. Figure 40. Rebasing a topic branch off another topic branch Now you can fast-forward

That command compares what is in your working directory with what is in your staging area. The result tells you the changes you’ve made that you haven’t yet staged. If you want to see what you’ve staged (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. Git hasn’t automatically created a new merge commit. It has paused the process while you resolve client branch as if it was based directly off the master branch instead.” It’s a bit complex, but the result is pretty cool. Figure 40. Rebasing a topic branch off another topic branch Now you can fast-forward

That command compares what is in your working directory with what is in your staging area. The result tells you the changes you’ve made that you haven’t yet staged. If you want to see what you’ve staged (content): Merge conflict in index.html Automatic merge failed; fix conflicts and then commit the result. Git hasn’t automatically created a new merge commit. It has paused the process while you resolve client branch as if it was based directly off the master branch instead.” It’s a bit complex, but the result is pretty cool. Figure 40. Rebasing a topic branch off another topic branch Now you can fast-forward

mismatch This usually means the resulting output will look different. In most cases this is not desired result from changing the translation, but occasionally it is. Checks that XML tags are replicated between pip install pytz python-bidi PyYAML pyuca # Install database backend for PostgreSQL pip install psycopg2-binary # Install database backend for MySQL pip install mysqlclient 6. Copy the file ~/weblate-env/lib/python2 com/jtauber/pyuca phply (optional for PHP support) https://github.com/viraptor/phply Database backend Any database supported in Django will work, see Database setup for Weblate and backends documentation

mismatch This usually means the resulting output will look different. In most cases this is not desired result from changing the translation, but occasionally it is. Checks that XML tags are replicated between pip install pytz python-bidi PyYAML pyuca # Install database backend for PostgreSQL pip install psycopg2-binary # Install database backend for MySQL pip install mysqlclient 6. Copy the file ~/weblate-env/lib/python2 com/jtauber/pyuca phply (optional for PHP support) https://github.com/viraptor/phply Database backend Any database supported in Django will work, see Database setup for Weblate and backends doc- umentation

mismatch This usually means the resulting output will look different. In most cases this is not desired result from changing the translation, but occasionally it is. Checks that XML tags are replicated between pip install pytz python-bidi PyYAML pyuca # Install database backend for PostgreSQL pip install psycopg2-binary # Install database backend for MySQL apt install default-libmysqlclient-dev pip install mysqlclient com/jtauber/pyuca phply (optional for PHP support) https://github.com/viraptor/phply Database backend Any database supported in Django will work, see Database setup for Weblate and backends documentation

mismatch This usually means the resulting output will look different. In most cases this is not desired result from changing the translation, but occasionally it is. Checks that XML tags are replicated between pip install pytz python-bidi PyYAML pyuca # Install database backend for PostgreSQL pip install psycopg2-binary # Install database backend for MySQL apt install default-libmysqlclient-dev pip install mysqlclient com/jtauber/pyuca phply (optional for PHP support) https://github.com/viraptor/phply Database backend Any database supported in Django will work, see Database setup for Weblate and backends doc- umentation

mismatch This usually means the resulting output will look different. In most cases this is not desired result from changing the translation, but occasionally it is. Checks that XML tags are replicated between License Weblate Documentation, Release 3.6.1 Needs editing Translation needs editing, this is usually result of source string change. The translation is stored in the file, depending on the file format it might running Weblate. See also: curl manpage, git config documentation 5.10.2 Git Git is first VCS backend that was available in Weblate and is still the most stable and tested one. See also: See Accessing

mismatch This usually means the resulting output will look different. In most cases this is not desired result from changing the translation, but occasionally it is. Checks that XML tags are replicated between the file, depending on the file format. Needs editing Translation needs editing, this is usually result of source string change. The translation is stored in the file, depending on the file format it might se/docs/manpage.html], git config documentation [https://git- scm.com/docs/git-config] Git Git is first VCS backend that was available in Weblate and is still the most stable and tested one. See also See Accessing

mismatch This usually means the resulting output will look different. In most cases this is not desired result from changing the translation, but occasionally it is. Checks that XML tags are replicated between License Weblate Documentation, Release 3.6 Needs editing Translation needs editing, this is usually result of source string change. The translation is stored in the file, depending on the file format it might running Weblate. See also: curl manpage, git config documentation 5.10.2 Git Git is first VCS backend that was available in Weblate and is still the most stable and tested one. See also: See Accessing