• Icon: Suggestion Suggestion
    • Resolution: Unresolved
    • None
    • Git
    • None
    • Our product teams collect and evaluate feedback from a number of different sources. To learn more about how we use customer feedback in the planning process, check out our new feature policy.

      We hit a lot of whitespace merge conflicts. It would help greatly if we had an option the add the `ignore-space-change` fag when merging.
      And also a preference to make this the default merge behaviour.

      git merge -Xignore-space-change feature123

            [SRCTREEWIN-1663] Add checkbox option to allow ignore-space-change when merging

            D K added a comment -

            Can you please re-open?

            D K added a comment - Can you please re-open?

            minnsey added a comment -

            Hi

            This issue affects a version we no longer support. To avoid any ambiguity we feel it is better to explicitly close it rather than leave it un-resolved. However, if you feel the issue is still relevant then please do re-open this issue and update the "Affects Versions" field.

            Thank you for using SourceTree.

            minnsey added a comment - Hi This issue affects a version we no longer support. To avoid any ambiguity we feel it is better to explicitly close it rather than leave it un-resolved. However, if you feel the issue is still relevant then please do re-open this issue and update the "Affects Versions" field. Thank you for using SourceTree.

              698877135425 Mukesh Kumar
              1c77cac1b17b D K
              Votes:
              16 Vote for this issue
              Watchers:
              9 Start watching this issue

                Created:
                Updated: