How do I use Meld as a merge tool with Sourcetree on Windows?

I feel the existing answers slightly missed the point. Here is my own dog food: Arguments Detail: Diff: $LOCAL $REMOTE Merge: $LOCAL $BASE $REMOTE –auto-merge –output=$MERGED For External Diff, you need to remove $BASE from your argument list. For 3-way merging, you need to click on the External Merge Tool option instead, which will only … Read more

edit commit comments in sourcetree after pressing commit

Just want to give more clarity to this old question with these simple pictures, although this is for the latest commit only (updated for SourceTree 2.5.2). Under ‘Workspace’, select ‘File Status’: Click the commit message box to expand it, then you will find ‘Amend last commit’ by clicking ‘Commit options’ at the bottom right:

Sourcetree – upgraded to latest version, git-flow missing

I have the same problem here, you can still use Git-Flow From the menu: “Repository-> Git flow /HG flow -> Next action” Using the hotkey: “⌥+⌘+F. But still not able to get the button back… :/ On the download page the button is also gone: https://www.sourcetreeapp.com/ Alternative you can download the previous version here: http://downloads.atlassian.com/software/sourcetree/SourceTree_2.1.dmg … Read more

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)