youngmon/atlassian-qna huggingface dataset:
Windows version bug that resulted in lost code
Asked by Ryan Scott:

This is more of a bug report than anything, unless of course there is a way to retrieve my lost code.

I had about 30 files to commit. Some were existing files that I had changed, others were new files.

I switched Commit Mode to "Selected Files" then noticed that I had some PSD's that I did not desire to commit.

I did a search for PSD and narrowed the list down to two.

I right clicked the first PSD and selected REMOVE.

I right clicked the second PSD and selected REMOVE.

At this point, my list refreshed and I noticed that one of my files "DeviceManager.cs" was marked as having been deleted. Upon investigating further, it appears that Atlassian deleted the file in response to me removing one of the PSDs above.

I of course Discarded the delete, but as a result, my file along with all changes I had made were lost. Can I get them back? I'm guessing no... in any case, this is a pretty nasty bug that should be looked at. Hopefully what I listed out is enough to find and fix the thing.

**EDIT**

This was using version 0.9.1.0


Answers:
author: Colin Goudie
body: I don't use source tree but if you go to command line and do 'git reflog' it will show you the commit ids of every head you were at. In git, as long as its been committed at some stage nothing is ever lost. Even modifying commits is really just branching off an older commit. The original commit is still there.So I suppose for you if you have committed that file before then you can still get it back.

comments: author: Ryan Scott
body: The problem is that I didn't have the changes committed yet, as they were newly made changes.


author: stevestreeting
body: So far I haven't been able to re-create this with 0.9.1.2 - can you tell me what version you were using please?


author: stevestreeting
body: I'm very sorry about this, it sounds like a selection bug. I'll try to reproduce it - I assume that DeviceManager.cs was modified and the PSDs were untracked? Can you recall where they were in relation to one another in the list? It may not be specific to these issues but I want to make sure I nail it.

\[edit\]In answer to whether you can get the changes back, if they were uncommitted changes then I'm afraid not. You should have had a confirmation message about unrecoverable changes, but I expect that you assumed, understandably, that it was in relation to the PSD (it's the same message for untracked files). Again, sincere apologies for this.
Unable to connect to own gitolite server
Asked by IchHabRecht:

Since the latest Windows update (0.9.1.1) I'm unable to connect to an own gitolite server (url for origin e.g. gitolite@git.example.local:my_repository.git) Sourcetree wants a password for the user gitolite. Connecting through terminal works perfectly.

Is there anything I can trigger to check the connection?

If you need more information and/or screenshots don't hesitate to ask.


Answers:
author: IchHabRecht
body: Thank you for your help. After update to 0.9.1.2 I reimported the keys and now it works again! So I don't know which was the solution either the update or the reimport. But nevertheless the result counts :-)

comments: author: stevestreeting
body: Glad you got it working! :)


author: stevestreeting
body: Oh, one of the things that did change in 0.9.1.1 is that if you're using PuTTY it now supports manual user/password login as well as SSH keys (previously if key authentication failed, everything failed, you couldn't provide a manual user/password). But since SSH usually prefers keys you shouldn't get the user/password prompt unless the key auth has already failed.


author: stevestreeting
body: Hmm, I have a gitolite setup on one of my servers here and I can still connect to it just fine (testing with 0.9.1.2 now but nothing much has changed in this area).

0.9.1.1 added a few extra options in the SSH area, which SSH implementation are you using, still PuTTY/Plink (it's now an option in Tools \> Options)?

Also do you have your correct key loaded (in Pageant assuming you're using PuTTY)?
right-click menu greyed out
Asked by Steven Jaffe:

I've just started using SourceTree on windows. When I right-click a commit, all the options are greyed out. In particular I'm trying to branch from a commit.

(Related question: where is the documentation, tutorial, etc? All I see are the FAQs and not many of those...)

Thanks.

Steve


Answers:
author: stevestreeting
body: Are you right-clicking a commit inside a dialog? When you're in a dialog many of the other functions are disabled because you're already in a process (e.g. merging). When you right-click on a commit in the top-level tab's log view though, you should have most things enabled (and some not, depending on which commit you select - for example selecting the current commit will disable Merge and Rebase, selecting the Uncommitted Changes line will disable things that require the line to be an actual commit, etc).


author: m
body: The documentation is installed with the product. Look for the **Help** menu.

comments: author: stevestreeting
body: Actually that's where it \*should\* be, but we haven't supplied dedicated Help with the Windows version yet. We're catching up with the Mac version one step at a time...


Tags: branch

git
Bookmarks backup?
Asked by stechico:

I'm using the OSX version. Is this possible by backing up \~/Library/Application Support/SourceTree, or am I missing other files/folders?

TIA


Answers:
author: KieranA
body: Hi Sherwin,

Sure thing, it's called "browser.plist" in the folder you've mentioned. You can just back it up and restore it if needs be, although if the repositories are missing SourceTree will just note that they aren't available anymore.

Cheers


author: stechico
body: Thanks guys. Added to Mackup: <https://github.com/lra/mackup/pull/21> =)


author: stevestreeting
body: Actually the bookmarks are just one file in that location: browser.plist
How can I use the diff tool of Visual Studio 2012 in Sourcetree?
Asked by Stefan:

I would like to use the diff tool of visual studio 2012 with Sourcetree. Is there a way to do that?


Answers:
author: Stefan
body: Ok, now I have it:

1. Tools \> Options \> Diff
2. Change 'External Diff Tool' to 'Custom'
3. Set 'Diff Command' to 'path\\to\\devenv' *(e.g. `C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\devenv.exe)`*
4. Set 'Arguments' to **'-Diff $LOCAL $REMOTE'** *(works with '-' or '/' on command line, SourceTree needs '-')*
5. Click OK
6. restart SourceTree

(Now it would be great if it would use an existing visual studio window and won't open a new one)


author: stevestreeting
body: You *should* be able to use it like so:

1. Tools \> Options \> Diff
2. Change 'External Diff Tool' to 'Custom'
3. Set 'Diff Command' to 'path\\to\\devenv'
4. Set 'Arguments' to '$LOCAL $REMOTE'
5. Click OK

However unfortunately there's a bug with using 'Custom' setup right now, I've fixed this but only for 0.9.1.2+. We're having some issues with out CDN which are delaying getting this update out, but once this is resolved you should be able to get 0.9.1.2 and use this option.

comments: author: Stefan
body: Ok, now I have version 0.9.1.2 - but It doesn't work...

If I open a command promt and use this command I get a diff window:

```
&gt;"C:\Program Files (x86)\Microsoft Visual Studio 11.0\Common7\IDE\devenv.exe" /Diff C:\Users\Stefan\AppData\Local\Temp\aiT4ea_WaveGraphRenderer.vb c:\Users\Stefan\Documents\WaveGraphRenderer.vb
```

But if I set the arguments in SourceTree to**'/Diff $LOCAL $REMOTE'** visual studio opens, the two files are opened in the IDE, but the diff window is not shown and I get the following error:

```
---------------------------Microsoft Visual Studio---------------------------The following files were specified on the command line:    C:/Program Files (x86)/Git/DiffThese files could not be found and will not be loaded.---------------------------OK  ---------------------------
```

Any idea?

<br />

Ciao!  
Stefan

P.S.: SourceTree has to be restartet after every change in the options menu.


author: Reagan Cooper
body: Thanks Stefan, this works great for diffs. But how can I use this for merges? Is there a switch for devenv.exe for merge or should I use the vsdiffmerge.exe with these args:

    $REMOTE $LOCAL $BASE $MERGED //m


author: Johannes Ebner
body: Above solutions do not work correctly. The only solution I have found which truly works, is this:

<https://github.com/Inmeta/Knowledge/wiki/Setting-Up-DiffMerge>


Tags: visual-studio
Automated / Silent Distributed Install of SourceTree
Asked by Dentsu Aegis Network - Isobar:

We're looking to deploy SourceTree to 100+ users. We've found the "manual" installer, but it is packaged as a clickonce installer which cannot be installed silently. Is there a way we can do this?

Thanks


Answers:
author: stevestreeting
body: Unfortunately we're limited by what ClickOnce can offer right now, and it doesn't have a good way of automating installs.

We've encountered enough unforseen limitations with ClickOnce that we're likely to try packaging SourceTree for Windows via another mechanism at some point in future, although this is likely to be a little while yet due to the fact that we're still catching up feature-wise with the Mac, and also the related testing and figuring out how to do auto-updates differently (we're pushing out enough updates that this is a must-have). Sorry for the inconvenience, it's great to know you're adopting SourceTree at scale, I just wish I had a quick answer for you on how to make it easier.

comments: author: Xabier Davila
body: Any updates on this process? This is a must for enterprise level setups


author: Nasir Mahmood
body: You can deploy in by using /qn switch at the end. I have deployed it to a number of computer by using this switch successfully.

Thanks.


author: Dan-Joe Lopez
body: sourcetree options.pngBecause I hate forum threads with outdated information... It appears that the current version of SourceTree (1.6.18) supports using the "/exenoui" option, which launches "the EXE setup without UI"

[](https://community.atlassian.com/t5/Sourcetree-questions/Automated-Silent-Distributed-Install-of-SourceTree/qaq-p/106503?attachment-id=8676){#link_116cae988a1778}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/3017/1/sourcetree%20options.png){#display_116cae988a1778_0}


author: Oliver Wilton
body: I've been asked to deploy this to a similar number of PCs.

I've found the offline installer to avoid proxy issues but the darn thing still requires a click. Any other options you can offer?

TIA!
Sourcetree for Windows not updating remote repository state
Asked by Gary Kratkin:

Manual update doesn't appear to do anything. If I fetch changes, the new commits do show, but the branch isn't displayed as behind, (e.g. "master 7 behind").

The Mac client displays the same repository correctly when I open it from an SMB share.

Any ideas before I file a bug?

Thanks


Answers:
author: stevestreeting
body: The Mac version automatically fetches in the background every X minutes (default 10), this isn't implemented in Windows yet so you have to Fetch manually. The push/pull icons also don't have the ahead/behind markers yet on Windows, although the branch label should have. Looks like they're displaying 'ahead' but not 'behind' correctly. Logged: <https://jira.atlassian.com/browse/SRCTREEWIN-497>

comments: author: Gary Kratkin
body: Thanks very much, Steve. I'll look forward to 9.1.2 with the fix.


author: stevestreeting
body: While I was fixing it I also noticed that I'd written some code to put annotations on the sidebar for ahead/behind but they'd never been activated. So 0.9.1.2 will do this too:

![](http://content.screencast.com/users/sjstreeting/folders/Jing/media/b8540911-be8c-4e04-9ef3-c0be96543ea3/2013-04-23_1753.png)
SourceTree for Windows - automatic downgrade?
Asked by Zsolt Nagy:

I installed SourceTree 0.9.0.5 for Windows 7. It was upgraded to 0.9.1.0 later. When checking for updates, SorceTree recommends installing 0.9.0.5 as the latest available version. Is there a good reason for not using 0.9.1.0? I really like the newly introduced submodule support otherwise.


Answers:
author: stevestreeting
body: Please ignore this 'update' - we're having some problems with our CDN right now where we seem to have inconsistent versions visible from different locations. Many apologies for this, we're following up with our providers and hope to have it resolved soon. Please don't accept that update and wait until you see 0.9.1.1 or 0.9.1.2 - the former has already been pushed out but the CDN problems are making it invisible to users right now :(
CR line endings
Asked by Hanspeter Bleuler:

Version 1.5.8 does not work with REALstudio anymore. They (unfortunately) use CR as line endings. Now SourceTree doesnt diff anymore. Is there a way to go back to an older version?


Answers:
author: Hanspeter Bleuler
body: Thanks Steve. I found a solution. The REALStudio project file .rbvcp must be converted to LF. This triggers REALStudio to save all files with LF. Need to do a "Save As" to write all file. I converted my new project and it works fine again.


author: stevestreeting
body: CRs are Mac OS 9 line endings, and neither git nor hg support these when it comes to linewise operations, including diffs. SourceTree uses git/hg to perform all diff operations so if they don't support it, we can't either. This can't have worked in previous versions of SourceTree since CR has never been supported.

You should be able to change any modern Mac OS X app to use LF, it's been the standard line ending for quite a while now.
Git-flow support in Sourcetree for windows
Asked by Torkel Niklasson:

When can we expect git-flow support in Sourcetree for Windows?


Answers:
author: stevestreeting
body: Development has started on this, it's earmarked for 0.9.2 which will hopefully be in a couple of weeks (depending on any other bugs that might interrupt it). <https://jira.atlassian.com/browse/SRCTREEWIN-56>
Recent commit messages per repo
Asked by Dave Smith:

Would it be possible to store recent commit messages on a per repo basis?

I work in a number of different repos and it would be nice to only see the recent commit message for the current repo in the popup.


Answers:
author: stevestreeting
body: Yeah, this isn't an option right now - personally I find it useful for the commits to be across repos, either because I have multiple forks of a repo or because there are other commonalities. The draft commit feature (where it saves the draft commit even when you cancel the commit dialog) is stored on a repository basis though.
Is it possible to clear the recent commit messages dropdown?
Asked by Brian Wong:

The recent commit messages dropdown is super helpful. But is there any way to clear it or clean it up? Mine is getting long with unused messsages.


Answers:
author: stevestreeting
body: It only actually saves the last 20 so it should clean itself up over time.

comments: author: Brian Wong
body: Thanks Steve. Unfortunately, that wasn't the answer I was looking for. I'll open a feature request to have it added.
How to track an ignored file
Asked by Miguel Catalan:

I ignored several files time ago, but actully I realised I need to track them again.

I can't find de way to do this.

Thanks in advance.


Answers:
author: stevestreeting
body: Change the filter at the top of the file status view to 'Show Ignored', then right-click the files you want to track and click 'Add'.

\[Edit\]This is for ad-hoc choosing files to add, but if you actually want to undo the ignoring of those types of files entirely you have to edit your ignore list. If you ignored the files just for this repository, you do it via Settings \> Advanced \> Edit (next to the Repository-specific Ignore List), or if you ignored the files globally you do it in Preferences (mac) or Tools \> Options (Windows), then go to the Git or Mercurial tabs and click the Edit File button next to the Global Ignore List field.

comments: author: Igor Ganapolsky
body: That helped a lot. The files can now be tracked again.


author: sebastian
body: Hi Steve, thank you for posting this answer I've been having a very similar issue and have not been able to find a solution.  

I see the option to add a file, but how to I add a whole directory back to index?  

I've modified my gitignore, however the new changes have no effect.

Thanks again!
Sourcetree release rate
Asked by Vasyl Boroviak:

Atlassians made huge impovements to the release rates of Jira, Confluence, etc. Made it monthly, fortnightly, weekly, ...

What is the supposed release rate for Sourcetree?


Answers:
author: KieranA
body: Hi Vasyl,

"Release early, release often" is our general guideline. For major versions the time between releases is slightly longer. I think we aim to get releases done at most every 6 weeks, but it's dependent on what we're working on. Some features can take a few weeks worth of work and because we want to pack many exciting features into a major release we may spend longer on that release. There's nothing set in stone, but as I say, we have aims and ambitions that we always plan on delivering.

Cheers

comments: author: Vasyl Boroviak
body: Thank you for this long and informative enough answer.
Cannot open IntelliJ as a External Diff in SourceTree
Asked by yueyingcui:

Hello,

I try to setup IntelliJ as my External Diff in Source Tree, but I failed.

In Tools -\> Options -\> Diff:

External Diff Tool: Custom

Diff Command: the path to the idea.exe file in IntelliJ

Arguments: diff $ LCOAL $REMOTE

When I right click the file need to merge the conflics, there is a window disappeared very quickly.

Would anyone please give me some suggestions? Thank you very much!


Answers:
author: Johannes Ebner
body: I found this but still can't get it working. IJ seems to close without opening the merge window. <http://stackoverflow.com/questions/14774053/intellij-diff-tool-in-sourcetree>

comments: author: Johannes Ebner
body: You will need to use a launcher script:

<https://www.jetbrains.com/help/idea/2016.1/running-intellij-idea-as-a-diff-or-merge-command-line-tool.html?origin=old_help>


Tags: diff

intellij-idea
Blame in SourceTree for Windows
Asked by Achim Hilwers:

Hi!

I have a problem with SourceTree for Windows:

When I use the command "Blame selected", all lines are in the state "Not committed yet" and no changes are shown.

I found out that the standard blame command blames the file in the working copy and as the setting "autocrlf" is "true", all lines are considered to be changed there.

Is there a possibility to change the behaviour of the git blame function to blame the currently selected branch?

Achim


Answers:
author: stevestreeting
body: I've created a feature request for this: <https://jira.atlassian.com/browse/SRCTREEWIN-470>

If your file is showing as completely modified, and you already have autocrlf=true, then it means it was committed from a machine with an incorrect setting. You will want to normalise the line endings and re-commit it to stop it permanently showing as modified in future.
SourceTree - cloning from HTTPS Git repo with sslVerify=false
Asked by Shane Carr:

We are setting up Git repositories for students to use as part of a class at our institution. We need to bypass the SSL verification step in order for the repositories to be cloned. For example, cloning a repository works on the command line like this:

```
$ env GIT_SSL_NO_VERIFY=true git clone https://domain.edu/path/to/gitCloning into 'git'...Username for 'https://domain.edu': xxxPassword for 'https://xxx@domain.edu':
```

Alternatively, this also works:

```
$ git config --global http.sslVerify false$ git clone https://domain.edu/path/to/gitCloning into 'git'...Username for 'https://domain.edu': xxxPassword for 'https://xxx@domain.edu':
```

However, when I use SourceTree to attempt to clone the repo, it gets stuck on the authentication part, even with the http.sslVerify in my .gitconfig and the "Disable SSL certificate verification" box checked in the preferences.

Any ideas?


Answers:
author: KieranA
body: Hi Shane,

If you're working on the Mac there's an option on the Git tab in preferences that says "Disable SSL certificate validation" which you can disable. The same option may be on Windows, too (apologies, I'm the Mac dev and haven't got a Windows OS running handy at the moment)

Cheers

comments: author: Andranik Azizbekian
body: Helped, thanks.


author: KieranA
body: Hi Shane,

I've filed an issue for you so it's worth following it from there. We'll still need to validly reproduce this issue but based on what you've said (<https://jira.atlassian.com/browse/SRCTREE-1547>). I'm creating my own apache server now to have a fake certificate so I can ignore and clone from a URL to clone from.

Cheers


author: Shane Carr
body: Mac OS X 10.7.5 and SourceTree 1.5.8.


author: Shane Carr
body: Hi Kieran,

Thanks for the response. As I mentioned in the OP, I have that box checked already.

SourceTree continues asking me for my username and password, even when they are correct.

\~Shane

comments: author: KieranA
body: Sorry missed that somehow. Is this on Windows or Mac?


author: Shane Carr
body: Mac OS X 10.7.5 and SourceTree 1.5.8.


author: Shane Carr
body: Strangely, I just tried in a Windows VM, and the repository cloned as expected when I checked the box in the preferences in Windows.


author: KieranA
body: Just as a sidenote, have you taken a look at your repository git config (rather than the global one) to see if http.sslVerify is set in there? If so, it would override the global config.


author: KieranA
body: Actually hold on a minute, you're trying to clone a repository so it should be taking your global config setting. I'll file this as a bug and ready to repro.


Tags: git

ssl
Create custom event for calnedar that applies to all the calendars
Asked by Michela Candotti:

Hello, Is there a way to add a custom event type that appears to all the calendar of our space?


Answers:
author: Andy Gladstone
body: [@Michela Candotti](/t5/user/viewprofilepage/user-id/448313) custom event types are managed on a calendar by calendar basis, not globally. There is currently no option in Confluence Cloud to create a single event type and apply it to all Calendars in the instance.

Sorry!


Tags: calendar

cloud

confluence-cloud
&quot;Seeking help troubleshooting Confluence macro setup for dynamic content.
Asked by joffdavid:

I'm currently facing difficulties with setting up Confluence macros for dynamic content and would greatly appreciate any assistance in troubleshooting the issue. I'm seeking guidance on resolving this matter, as I aim to ensure smooth functionality and seamless integration of macros for dynamic content within Confluence. Any expertise, advice, or step-by-step instructions that can shed light on the troubleshooting process would be of immense help. Thank you in advance for your support and valuable insights......


Answers:
author: Nic Brough -Adaptavist-
body: Welcome to the Atlassian Community!

Could you describe the problems you are having? We can't do much more than point you at standard documentation without a description of the actual problem.


Tags: bitbucket

cloud