Regression in TaskSelectLineAttributes.ui

[Roy_043]

A recent commit has reverted many textual improvements in the TaskSelectLineAttributes.ui file. Seems as if a rebase was skipped.
https://github.com/FreeCAD/FreeCAD/comm ... 4205d42d67

pinged by pinger macro

Can you look at this please. Thanks.

[wandererfan]

I picked up an old version of TaskDimension.ui while doing this PR https://github.com/FreeCAD/FreeCAD/pull/5441. This looks like a similar issue.

Haven't been able to figure out what happened yet.

This git commit f2d624cede from Jan 07 has the correct text and this one git commit 242dcd7e44 reverts the text to the original.

[Roy_043]

Haven't been able to figure out what happened yet.

Seems as if a rebase was skipped.

Is there a way to fix this 'automagically', or does someone have to do this 'by hand'?

[wandererfan]

Is there a way to fix this 'automagically', or does someone have to do this 'by hand'?

My magic wand needs recharging. If it is just a case of setting the ui file back to where it was before the commit, then we can check out the previous version, save the ui file, check out the current version, replace the ui file and commit. If there are changes to the ui file mixed in with the regression to the previous version, then it is a "by hand" job.

[Roy_043]

'by hand' it is then.

[Roy_043]

https://github.com/FreeCAD/FreeCAD/pull/5486

[Roy_043]

Merged.