Uploaded image for project: 'Sourcetree for Windows'
  1. Sourcetree for Windows
  2. SRCTREEWIN-1286

Merge: there is no way to just merge to working tree (--no-commit --no-ff)

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: Cannot Reproduce
    • Icon: Low Low
    • None
    • 1.3.2
    • Git
    • None

      Try merging through right click on another branch. There isn't an option to just merge without committing.

      The option is present in Merge dialog opened from the toolbar but it doesn't really function. If I uncheck all the checkboxes in that dialog I expect to end up with merged changes in the working tree (git merge --no-commit --no-ff <branch>). Instead it commits/fast forwards regardless of the checkboxes.

      On Mac the option is present in both dialogs - and it works.

              sstreeting Steve Streeting (Inactive)
              b3c6e671d997 Jyrki Lilja
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Created:
                Updated:
                Resolved: