Alternative conflict resolutions after repository conversion for the translation bot#33
Open
Alternative conflict resolutions after repository conversion for the translation bot#33
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hello!
I have just finished converting this repository to a form compatible with our new translation bot (Introducing the Translations PR Bot!). Unfortunately this conversion does no accurately preserve merges in all cases. I had to redo some conflict resolutions and choose one version in each case. This PR contains the versions that were not chosen.
Normally I would be able to tell which version is good by looking at the original
mainbranch and making the same choice. The problem is that in many cases the choice was not made at all - i.e. the conflict was not edited to select one version but instead committed together with the<<<<<<<<<</==========/>>>>>>>>>>conflict markers.Also there were some conflicts where the decision was to remove some text and here's a chance that it was done by accident.
It's actually possible that none of the changes here are correct. Ideally that should be the case. Unfortunately I don't know Persian so I can't tell myself. Please review it and tell me which parts are wrong and should be removed from the PR and which are good and should be kept. Then I'll update the PR and we can merge what's left of it.