catman wrote: ↑
Thu Feb 20, 2020 6:48 pm
I am not sure what conflicts you refer to. The last relevant post was from triplus
We are obviously talking about the unmerged pull request #1148
If you look at it online, there are conflicts with the current code. This means the pull request cannot be merged as is right now. A developer that is interested in this needs to look at the code, fix the conflicts, and then it can be proposed again.
Obviously to test this you'd need to compile FreeCAD with the changes introduced by this pull request. But as it is now, it cannot be compiled, again, because of the "conflicts" in the code. You'd need to understand the C++ code, fix the conflicts, and then compile and test locally.
Source code management