You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
With our process that involves ~50 PRs in flight (and counting, this will only start going down after 16.0 is out), any impediment to automatic merge resolution is a significant pain. For most files, merges are resolved by ignoring the conflict markers and regenerating the files. ArabicShaping is manually maintained, and has bitten me recently while trying to synchronize all my PRs.
If we treat the schematic name as a pseudoproperty (we treat the joining type as a pseudoproperty Other_Joining_Type anyway), this should be tractable.
The text was updated successfully, but these errors were encountered:
On Fri, Jun 7, 2024, 12:41 Robin Leroy ***@***.***> wrote:
With our process that involves ~50 PRs in flight (and counting, this will
only start going down after 16.0 is out), any impediment to automatic merge
resolution is a significant pain. For most files, merges are resolved by
ignoring the conflict markers and regenerating the files. ArabicShaping is
manually maintained, and has bitten me recently while trying to synchronize
all my PRs.
If we treat the schematic name as a pseudoproperty (we treat the joining
type as a pseudoproperty Other_Joining_Type anyway), this should be
tractable.
—
Reply to this email directly, view it on GitHub
<#860>, or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ACJLEMF4EBBXJDOPATMAEGDZGIEFDAVCNFSM6AAAAABI7GUP4SVHI2DSMVQWIX3LMV43ASLTON2WKOZSGM2DCMBVHA2TONY>
.
You are receiving this because you are subscribed to this thread.Message
ID: ***@***.***>
With our process that involves ~50 PRs in flight (and counting, this will only start going down after 16.0 is out), any impediment to automatic merge resolution is a significant pain. For most files, merges are resolved by ignoring the conflict markers and regenerating the files. ArabicShaping is manually maintained, and has bitten me recently while trying to synchronize all my PRs.
If we treat the schematic name as a pseudoproperty (we treat the joining type as a pseudoproperty Other_Joining_Type anyway), this should be tractable.
The text was updated successfully, but these errors were encountered: