The merge tool that understands your code

#if confuse the block toool

If a #if block exists before a modified function, the code within the #if is also grabbed when you view a diff. It is only grabbed on the destination file.

21 votes
Vote
Sign in
(thinking…)
Sign in with: facebook google
Signed in as (Sign out)
You have left! (?) (thinking…)
Anonymous shared this idea  ·   ·  Flag idea as inappropriate…  ·  Admin →

2 comments

Sign in
(thinking…)
Sign in with: facebook google
Signed in as (Sign out)
Submitting...
  • Colin Young commented  ·   ·  Flag as inappropriate

    This is going to become a bigger issue as .Net 5/DNX core starts to be adopted. It would be really nice to see conditional compilation blocks handled as nicely as the rest of the code is.

Feedback and Knowledge Base