The merge tool that understands your code

Merge project files

That'd be nice if you'd help to merge project files (csproj, vbproj) that are generated by the IDE.

374 votes
Vote
Sign in
Check!
(thinking…)
Reset
or sign in with
  • facebook
  • google
    Password icon
    I agree to the terms of service
    Signed in as (Sign out)
    You have left! (?) (thinking…)
    Rémi BOURGARELRémi BOURGAREL shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

    4 comments

    Sign in
    Check!
    (thinking…)
    Reset
    or sign in with
    • facebook
    • google
      Password icon
      I agree to the terms of service
      Signed in as (Sign out)
      Submitting...
      • Colin YoungColin Young commented  ·   ·  Flag as inappropriate

        I think full XML with extensions to support .??proj files would be the best solution (i.e. relax ordering in some cases, enforce in others, etc.) We'd probably want to track ordering changing in XML in any case and make the decision based on the type of file if it was important or not.

      • Bruno BrantBruno Brant commented  ·   ·  Flag as inappropriate

        @Jason, what if we just added some options to the XML merger, like, don't care about item order, etc?

        Grouping, I think, is pretty complex.

      • Jason StangroomeJason Stangroome commented  ·   ·  Flag as inappropriate

        Merging project files using XML semantics only would be insufficient. For example:
        * Order of Items is unimportant.
        * Order of Properties can be important.
        * Grouping child elements into ItemGroups and PropertyGroups without Conditions is unimportant.

      Feedback and Knowledge Base