Resolve conflict in weblate

[anuj-scanova]

Describe the issue

Set up a new component with Github and set up qa branch to fetch source strings from.

After a few changes to the qa branch by the developers, weblate locks the component with a conflict error

Rebasing (1/2)
error: could not apply c7ec3527... i18n: Update translation files
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply c7ec3527... i18n: Update translation files
Auto-merging src/locale/messages.es.xlf
CONFLICT (content): Merge conflict in src/locale/messages.es.xlf
 (1)

After following the steps mentioned in Typical workflow for fixing merge conflicts, Git is giving the following error error: Could not read 2dcb03a7d34b7a366cc0102fbc4c92542e7a5ca2 on running the git remote update weblate command

➜  weblate git:(master) git remote update weblate
Fetching weblate
remote: Enumerating objects: 3047, done.
remote: Counting objects: 100% (3047/3047), done.
remote: Compressing objects: 100% (2393/2393), done.
remote: Total 3047 (delta 664), reused 2914 (delta 587), pack-reused 0
Receiving objects: 100% (3047/3047), 40.72 MiB | 1.79 MiB/s, done.
Resolving deltas: 100% (664/664), done.
error: Could not read 2dcb03a7d34b7a366cc0102fbc4c92542e7a5ca2
fatal: Failed to traverse parents of commit e77cfc1cb70d22b5433b9dbb8ccf04111e5304fc
error: https://translate.example.io/git/qcg/qcg-frontend/ did not send all necessary objects

error: could not fetch weblate

I already tried

• I've read and searched the documentation.
• I've searched for similar issues in this repository.

Steps to reproduce the behavior

1. Go to '...'
2. Scroll down to '...'
3. Click on '...'
4. See error

Expected behavior

No response

Screenshots

No response

Exception traceback

No response

How do you run Weblate?

Docker container

Weblate versions

 * Weblate: 4.14.1
 * Django: 4.1.1
 * siphashc: 2.1
 * translate-toolkit: 3.7.3
 * lxml: 4.9.1
 * Pillow: 9.2.0
 * bleach: 5.0.1
 * python-dateutil: 2.8.2
 * social-auth-core: 4.3.0
 * social-auth-app-django: 5.0.0
 * django-crispy-forms: 1.14.0
 * oauthlib: 3.2.1
 * django-compressor: 4.1
 * djangorestframework: 3.13.1
 * django-filter: 22.1
 * django-appconf: 1.0.5
 * user-agents: 2.2.0
 * filelock: 3.8.0
 * rapidfuzz: 2.8.0
 * openpyxl: 3.0.10
 * celery: 5.2.7
 * kombu: 5.2.4
 * translation-finder: 2.14
 * weblate-language-data: 2022.7
 * html2text: 2020.1.16
 * pycairo: 1.21.0
 * pygobject: 3.42.2
 * diff-match-patch: 20200713
 * requests: 2.28.1
 * django-redis: 5.2.0
 * hiredis: 2.0.0
 * sentry_sdk: 1.9.8
 * Cython: 0.29.32
 * misaka: 2.1.1
 * GitPython: 3.1.27
 * borgbackup: 1.2.2
 * pyparsing: 3.0.9
 * pyahocorasick: 1.4.4
 * python-redis-lock: 3.7.0
 * charset-normalizer: 2.1.1
 * Python: 3.10.7
 * Git: 2.30.2
 * psycopg2: 2.9.3
 * psycopg2-binary: 2.9.3
 * phply: 1.2.5
 * ruamel.yaml: 0.17.21
 * tesserocr: 2.5.2
 * boto3: 1.24.73
 * zeep: 4.1.0
 * aeidon: 1.11
 * iniparse: 0.5
 * mysqlclient: 2.1.1
 * Mercurial: 6.2.2
 * git-svn: 2.30.2
 * git-review: 2.3.1
 * Redis server: 6.2.7
 * PostgreSQL server: 14.5
 * Database backends: django.db.backends.postgresql
 * Cache backends: default:RedisCache, avatar:FileBasedCache
 * Email setup: django.core.mail.backends.smtp.EmailBackend: email-smtp.ap-south-1.amazonaws.com
 * OS encoding: filesystem=utf-8, default=utf-8
 * Celery: redis://cache:6379/1, redis://cache:6379/1, regular
 * Platform: Linux 5.15.0-1019-aws (aarch64)

Weblate deploy checks

No response

Additional context

No response

[github-actions]

This issue looks more like a support question than an issue. We strive to answer these reasonably fast, but purchasing the support subscription is not only more responsible and faster for your business but also makes Weblate stronger.

In case your question is already answered, making a donation is the right way to say thank you!

[anuj-scanova]

UPDATE

Just ran the git remote add weblate and git remote update weblate in the local project repository and it worked well. However git merge weblate/main gives not something we can merge

➜  qcg-frontend git:(qa) git remote add weblate https://admin:key@translate.example.io/git/qcg/qcg-frontend/
➜  qcg-frontend git:(qa) git remote update weblate
Fetching weblate
From https://translate.example.io/git/qcg/qcg-frontend
 * [new branch]        qa         -> weblate/qa
➜  qcg-frontend git:(qa) git merge weblate/main
merge: weblate/main - not something we can merge
➜  qcg-frontend git:(qa) git remote update weblate
Fetching weblate
➜  qcg-frontend git:(qa) git merge weblate/main
merge: weblate/main - not something we can merge
➜  qcg-frontend git:(qa) 

[nijel]

Just replace main with qa, the branch is not updated in the hint.

[github-actions]

Thank you for your report; the issue you have reported has just been fixed.

• In case you see a problem with the fix, please comment on this issue.
• In case you see a similar problem, please open a separate issue.
• If you are happy with the outcome, don’t hesitate to support Weblate by making a donation.

[anuj-scanova]

Thanks @nijel, replacing main with qa worked 👍