Merge conflicts in fsproj files
Nobody has claimed this yet.
- Dominant language
- F#
- Stars
- 2.1k
- Forks
- 528
- Avg merge
- 1d 12m
- Merged PRs (30d)
- 54
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?
Contributor guide
No contributing guide indexed for this repository
First steps
- Read the whole issue, then the project's contributing guide.
- Comment on the issue to say you are picking it up — it saves two people doing the same work.
- Fork the repository and make your change on a branch.
- Open a pull request that references the issue number.
Research direction
Start by examining the generated fsproj files and their automatically generated choose nodes. Investigate whether Visual Studio supports extracting those nodes into target files, then determine the required Paket behavior and how generated files could avoid merge conflicts. Done means a documented, validated approach with no unresolved design questions.
Written by the indexing model from the issue text.
Assessment
- Tech stack
- fsharp
- Domain
- build-system, tooling
- Issue type
- Refactor
- Difficulty
- 5/5
- Estimated time
- Over a week
- Activity status
- Stale
- Clarity
- Needs clarification
- Newbie friendliness
- 25/100