{% load i18n %} {% load translations %} {% if component.get_export_url %}

{% trans "Typical workflow for fixing merge conflicts" %}

  1. {% trans "Open an existing checkout of the upstream repository or perform a fresh one." %}
  2. {% trans "Commit all pending changes in Weblate and lock the translation component." %}
    wlc commit; wlc lock
  3. {% trans "Add Weblate exported repository as a remote." %}
    git remote add weblate {{ component.get_export_url }} ; git remote update weblate
  4. {% trans "Merge Weblate changes and resolve any conflicts." %}
    git merge weblate/{{ component.branch }}
  5. {% if component.merge_style == "rebase" %}
  6. {% trans "Rebase Weblate changes on top of upstream and resolve any conflicts." %}
    git rebase origin/{{ component.branch }}
  7. {% endif %}
  8. {% trans "Push changes into upstream repository." %}
    git push origin {{ component.branch }}
  9. {% trans "Weblate should now be able to see updated repository and you can unlock it." %}
    wlc pull ; wlc unlock
{% endif %}

{% trans "Check the FAQ for info on how to resolve this." %}