To add your supply request file, do the following:
From your BitbucketStationSupplies in Bitbucket, click Source to open the source directory. Notice you only have one file,
supplies.txt, in your directory.A. Source page: Click the link to open this page.
B. Branch selection: Pick the branch you want to view.
C. More options button: Click to open a menu with more options, such as 'Add file'.
D. Source file area: View the directory of files in Bitbucket.
From the Source page, click the More options button in the top right corner and select Add file from the menu. The More options button only appears after you have added at least one file to the repository. A page for creating the new file opens, as shown in the following image.
A. Branch with new file: Change if you want to add file to a different branch.
B. New file area: Add content for your new file here.
Enter supplyrequest in the filename field.
Select HTML from the Syntax mode list.
Add the following HTML code to the text area:
<p>We are requesting additional supplies. Please send us the following:</p>
<ul>
<li>space ice cream</li>
<li>nerf darts</li>
<li>telescope light shield</li>
</ul>Click Commit. The Commit message field appears with the message:
supplyrequest created online with Bitbucket.Click Commit under the message field.
November 2, 2015 by Dwayne| Command Line, Git Using Beyond Compare With Sourcetree For Mac. Last updated: November 2, 2015 I used to use Diffmerge for my merge/comparison needs, however I find the outdated interface to be unfriendly and ugly to look at. Best Git clients for macOS. It doesn't require an external merge tool (like Sourcetree). This is very useful and works better than other tools, and also is cross.
Download Sourcetree For Mac
Hello,
I've been using SourceTree for a couple months now and this issue has been bugging me since the beginning. I'm using TortoiseMerge as my external merge tool and when I get conflicts, I call it to resolve them... The issue is that if I enter it, SourceTree automatically assumes everything is resolved even if I don't change a single thing in the file.
Is this a bug with SourceTree, or a bug with TortoiseMerge? Is there any way to fix it? Do other merge tools have the same issue?
On a related note, I've always used WinMerge before but it's not in the list of external merge tools for SourceTree... Why is that? Is there any way to use it?
Thanks in advance