Tag: "diff"

After clean installation of MacOS 10.14 Mojave and Sourcetree external diff isn't working.  After some investigation it isn't working because of security settings - for some reason S...

• Sourcetree
• Question
• automation
• diff
• mac
• sourcetree

...y .gitconfig looks like [..] [difftool "sourcetree"] cmd = 'C:/Program Files/SourceGear/Common/DiffMerge/sgdm.exe' \"$LOCAL\" \"$REMOTE\" [mergetool "sourcetree"] cmd = 'C:/Program Files/SourceGear/C...

• Sourcetree
• Question
• diff
• merge
• sourcetree

I have a Bitbucket customer that reports, and I can reproduce, the Diff view of a Pull Request doesn't scroll properly in the Files panel listing. The bottom of the scroll bar is not displaying so g...

• Bitbucket
• Question
• bitbucket
• bitbucket-server
• diff
• pull-request
• server

After update to 3.1.3 version of sourcetree I can't launch external diff/merge tool. I've tried everything that I could find, but it didn't help much. I use IntelliJ IDEA tool and set it as f...

• Sourcetree
• Question
• diff
• merge
• sourcetree

I have multiple different binary filetypes that require different programs to diff and merge. I would like to be able to launch the proper diff program when right-clicking a file and selecting `E...

• Sourcetree
• Question
• diff
• sourcetree

It is not possible to view wiki history from BitBucket web page. In wiki page history links lead to project main repository instead of wiki repository, resulting in "this link has no power here" erro...

• Bitbucket
• Question
• bitbucket
• bitbucket-cloud
• cloud
• diff
• wiki

...ased laptop. https://superuser.com/questions/787664/why-are-backslashes-displayed-as-%E2%82%A9-korean-won-sign-w-strikethrough-in-not   However, after I click the "external diff", nothing h...

• Sourcetree
• Question
• diff
• p4merge
• sourcetree

The default behavior of SourceTree (at least macOS) is diff only one file in external diff. How could I diff the whole repo between two commits?   I searched in this forum but didn't get a a...

• Sourcetree
• Question
• diff
• external-diff
• sourcetree

...ist all commits for that ticket.  In the lower part I can see all the files that were added/modified/deleted for the ticket. I can then do a consolidated diff on a file where it takes all t...

• Sourcetree
• Question
• diff
• sourcetree

In SourceTree, when highlighting a changed file in preparation for a commit, there is a diff displayed in a neighboring pane. In that pane I can stage individual hunks or even individual lines. H...

• Sourcetree
• Question
• diff
• git

Diff window doesn't show Japanese character correctly in Shift-jis file.  And once I changed the default character set to UTF-8, diff window was fixed but commit logs became corrupted instead.&n...

• Sourcetree
• Question
• language-ja
• character
• diff
• sourcetree

I have read all the other posts about setting up the External Diff.  For some reason I can't seem to get it to work.  I have version 2.5.5.0 SourceTree and Embedded GIT 2.16.2+git-lfs v2.3...

• Sourcetree
• Question
• bulk-edit
• diff
• external
• sourcetree

It used to be really easy to setup a service to email commit diffs to a list of people.   I see it has been deprecated in favour of email notifications, web hooks and connect integration. &n...

• Bitbucket
• Question
• bitbucket
• diff
• email

Hi, I try to use merge tool or diff tool DiffMerge but not start. Before I update to High Sierra all work. I'm not compare remove o renamed file. In the system log and in LittleSnich there is a w...

• Sourcetree
• Question
• diff
• merge
• signature
• sourcetree

In the earlier Hooks services, there are Email and Email Diff service hooks. What are their equivalents in the Webhooks?

• Bitbucket
• Question
• bitbucket
• diff
• email
• webhook

I'm using a Macbook Pro and have installed both Visual Studio Code (with command line) and Sourcetree.  I used sourcetree to setup the external diff tool.  And can confirm git is using it b...

• Sourcetree
• Question
• diff
• merge
• sourcetree
• visual-studio

Hi, I'm using SourceTree 2.3.1.0. I use external diff/merge(LVCompare, LVMerge) tool to work with my LabVIEW files. These external tools need the absolute path of the files I want to c...

• Sourcetree
• Question
• diff
• external
• labview
• merge
• sourcetree
• +1 more tag...

Is there a way to see the differences between a draft update for a page and the published version of that page? Since Confluence saves a draft when you leave a page while editing, I occasionally c...

• Confluence
• Question
• collaborative-editing
• confluence
• diff
• draft

When I do an External Diff, it creates some workfiles with the strings _BACKUP_, _BASE_, _LOCAL_ and _REMOTE_ in them. These files remain even after the diff is done. I'd like them to be deleted a...

• Sourcetree
• Question
• diff
• sourcetree

I've googled all forms of "bitbucket pull request diff all files" that I could think of and I've checked the documentation.  All the docs seem to implicitly assume that changes are made mostly i...

• Bitbucket
• Question
• bitbucket
• diff
• pull-request

My PC OS is Windows 10. The external diff tool is P4Merge. Source Tree version 2.1.2.5   In Source Tree, when there is merge conflict, I launch the external diff tool P4Merge. In the P4Merge I...

• Sourcetree
• Question
• diff
• sourcetree

It seems that setting a custom tool for either merging or diffing is always set within git's global config area. Due to the needs of our team, I require explicit control of the merge workflow for a...

• Sourcetree
• Question
• diff
• merge
• sourcetree

...omefile.xml: XML document, UTF-8 Unicode text, with very long lines By default SourceTree for Windows is not showing diff for this file in any commit. It shows a message "No changes in this file have been d...

• Sourcetree
• Question
• diff
• git
• sourcetree

Hi, I'm using - SourceTree 2.1.2.5 on 64-bit Windows 10 - Git 2.13.2 - P4Merge and I have configured P4Merge as the external diff/merge tool. I have 2 branches.   testmerge - c...

• Sourcetree
• Question
• diff
• p4merge
• sourcetree
• windows

sourcetree diff view gitlab diff view   Can sourcetree show whitespace like gitlab diff view?

• Sourcetree
• Question
• diff
• sourcetree