Repository navigation
Merge conflicts in fsproj files #2297
Description
In my FAKE branch I'm in the sad position that I need to merge back and forth. And one thing slowly driving me insane are the merge conflicts in the automatically generated choose nodes in the fsproj files.
We should have extracted them into target files from the beginning. This way I could ignore them on merge conflicts (or gitignore them when paket creates them on restore).
Is Visual Studio supporting that currently?
Activity
forki commentedon Apr 27, 2017
matthid commentedon Apr 27, 2017
We always knew there was a price when doing it this way. But I feel like the price is just too high now with netstandard and all those small libraries.
The promise of paket was always that we solve/review conflicts in paket.lock file, but we actually need to review every file now (fsproj, app.config, and sometimes even code...)
It really has a hard time at the moment :/. Sorry its just my frustration speaking right now ...
Maybe we should just push the ecosystem into the new netcore world and find a nice integration path there and use that for full net compilation as fast as possible...
forki commentedon Apr 27, 2017
0x53A commentedon Apr 28, 2017
What do you think about adding something similar like #2234 to the assembly references?
That means in most cases, a big choose block is replaced with a single Reference.
It would be user-controllable through the framework restriction.
matthid commentedon Apr 28, 2017
@0x53A to be really honest I don't think it would improve much. First we introduce another set of large changes and second we still have more than enough lines (lets say we can improve from 5000 to 1000 lines that's already quite a lot, but it doesn't solve the problem here)
isaacabraham commentedon May 2, 2017
@forki I thought we were told that the splitting as a separate file should have been possible?
forki commentedon May 3, 2017
No that's only for MSBuild 15 - and there we load it in memory.
matthid commentedon May 6, 2017
Previous attempt: #447