🚚 Update weblate merge-resovling script

[boryanagoncharenko]

Currently, the merge-weblate-resolving-conflicts script executes a doit run _autopr which generates code and then immediately does a git commit. If a new language is added though, some of the newly generated files remain untracked and are not included in the commit. This causes the following merge command to fail:

+ git merge -s recursive -X ours origin/main --no-edit
error: The following untracked working tree files would be overwritten by merge:
	grammars/keywords-jbo.lark
Please move or remove them before you merge.

Evaluate whether adding a git add . before the commit would have unwanted side effects.

[rix0rrr]

How are we going to test this? Did you run it locally? Can we prevent automatic merge on the next “real” run so that we can confirm it doesn’t add unwanted files?

[boryanagoncharenko]

How are we going to test this? Did you run it locally? Can we prevent automatic merge on the next “real” run so that we can confirm it doesn’t add unwanted files?

Yes, I ran this locally. I think we agree that if we run doit run _autopr _autopr_weblate we can expect that new files will be generated and these are intended to be committed. The question is whether using git add . would also include files that were not intended for the commit. By looking at the doit tasks, I was not able to spot any potentially unwanted files, so I added the command git add . and asked you to evaluate.

Unfortunately, there is not really a way to test this. Next time I have to run the script, I could perform the merge step-by-step and manually check the untracked files. However, this is not an effective testing strategy because I cannot exercise all possible conditions that could lead to untracked files.

One way to reduce the risk is to change the scope to git add grammars. Alternatively, we could close this PR and I will perform the merge manually. After all there is a finite number of languages that can be added.

[rix0rrr]

I’m okay to give it a go

[mergify]

Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork).

[rix0rrr]

You know what, I would feel safer if we could scope the add to specific directories, like trnaslations and content

[mergify]

This pull request has been removed from the queue for the following reason: pull request dequeued.

Pull request #6163 has been dequeued. The pull request rule doesn't match anymore. The following conditions don't match anymore:

• all of:
  • #approved-reviews-by>=1
  • #changes-requested-reviews-by=0
  • check-success=build
  • check-success=cypress
• any of: [🔀 queue conditions]
  • all of: [📌 queue conditions of queue default_queue]
    • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
    • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
    • any of: [🛡 GitHub branch protection]
      • check-neutral = build
      • check-skipped = build
      • check-success = build
    • any of: [🛡 GitHub branch protection]
      • check-neutral = cypress
      • check-skipped = cypress
      • check-success = cypress
    • any of: [🛡 GitHub branch protection]
      • check-neutral = autopr
      • check-skipped = autopr
      • check-success = autopr

You should look at the reason for the failure and decide if the pull request needs to be fixed or if you want to requeue it.

If you want to requeue this pull request, you need to post a comment with the text: @mergifyio requeue

[mergify]

Thank you for contributing! Your pull request is now going on the merge train (choo choo! Do not click update from main anymore, and be sure to allow changes to be pushed to your fork).