youngmon/atlassian-qna huggingface dataset:
How to prevent 'wrong' merge after checkout?
Asked by Michael Sparer:

I'm using Sourcetree v1.8.1 and git 1.8.5.2 under OS X 10.9.2. and was wondering how there could be "Uncommited changes" right after checking out a branch from a remote repository. Then I found out that the remote repository has two files in it *JavascriptBehavior.java* and *Java**S**criptBehavior.java,*my cloned repo however contains only one file (JavascriptBehavior.java). This is because git performs an automatic merge of the two files on checkout and displays the merge as uncommited changes.

I tried to solve this by setting core.ignorecase to false in my global git settings and switching to system git in Sourcetree but to no avail. Is there any way to make Sourcetree respect the core.ignorecase setting, or is there an easier/better way?


Answers:
author: Seth
body: This is not a Git issue, but an OS issue:

[](http://apple.stackexchange.com/questions/22297/is-bash-in-osx-case-insensitive)<http://apple.stackexchange.com/questions/22297/is-bash-in-osx-case-insensitive>

If your filesystem doesn't allow two filenames that are identical except for case, Git has to either not check out one of the files, or merge the files.

Go yell at whichever Linux dev created/named those files, and have him change it so developers on Mac and Windows can use the repo.

comments: author: Michael Sparer
body: It is indeed an OS issue that I was hoping to be able to workaround using the core.ignorecase setting, as I was under the wrong impression that my file system is case-sensitive... I'd rather yell at the Apple developer who chose to make it case-insensitive (but obviously case-preserving) than at the Linux dev ;-) Cheers anyway for answering my question!


author: Seth
body: It'd be great if case-sensitive filesystems were standard. Apple's implementation is still a step better than Windows, which is only *usually* case-preserving (in certain conditions it will convert an all upper filename to all lower).


Tags: case-sensitive
sourcetree won't start windows
Asked by greg_fox:

Hi,

As of today, my SourceTree 1.5.2 won't load. I have uninstalled and reinstalled it several times and still won't work.

Does anyone have a solution?

Thanks...


Answers:
author: Ciaran Fontein
body: If repairing the NET framework did not work try deleting the Atlassian folder inside the hidden AppData folder. It worked for me.

comments: author: Husnain Ali
body: It worked for me.


author: Nikolaj Kuntner
body: Yes, this worked, thank you!

Deleting the SourceTree related folders in C:\\Users\\MyName\\AppData\\Local\\Atlassian is what I did. The Attlassian folder also contrained other stuff.


author: myco owner
body: I'm getting the same problem, but the AppData\\Local folder doesn't contain a Atlassian folder.

Uninstalling and reinstalling, or repairing doesn't fix the issue either.


author: myco owner
body: So, I found a solution to my situation.

I had to repair my .Net Framework 4.5 installation. Just Control Panel -\> Uninstall a Program, then find Microsoft .NET Framework 4.5.1, click Uninstall/Change, then choose to Repair.

After doing that I was able to get mine working. Best of luck.

comments: author: Dan Hennion
body: Thanks for the tip! Glad people are finding their answers to this issue despite Atlassian employees not being of much help on it (there are a few other threads with windows launch issues that haven't been addressed very well). Unfortunately this didn't work for me, so I'll keep searching.


author: Prabhu Vinod
body: Check the list of installed programs in control panel. If multiple versions of source tree are installed, then uninstall all and install the latest version. That's all.


author: ex-jedi
body: Some others have suggested it's a temp files issue. So I Ran CCleaner and that solved it for me.


author: Dan Hennion
body: Sounds like the issue I'm having here: [](/questions/304320/crash-on-launch-windows-7)<https://answers.atlassian.com/questions/304320/crash-on-launch-windows-7>

Sadly, no solution yet. Very disappointing.


author: greg_fox
body: The last date in the log file is 4-21. That was the last time I used SourceTree. So, it looks like it not even getting to that point.

comments: author: Adrian Moerchen
body: Hm, maybe just try to delete/rename the whole SourceTree folder within the AppData. But note, this will propably delete all your configuration.


author: greg_fox
body: Tried that already. No go...


author: Adrian Moerchen
body: There should be a log file under %AppData%\\..\\Local\\Atlassian\\SourceTree
Mac os X Sourcetree: Unable to log in to bitbucket and Github but can with windows
Asked by Dwight Browne:

1) Downloaded windows Sourtree on windows server. Successfully logged into bitbucket and git

2) Downloaded Max os X Sourcetree on mac: Bitbucket: Authentication Error GitHub: Bad credentials

3) Yes. I am entering the correct name and password.


Answers:
author: Dwight Browne
body: Was a keychain issue. Mac OS X is not a flavor of \[L\|U\]nix I am used to.

Thanks for your help.


author: KieranA
body: Hey Dwight,

There's various reasons this could be happening

1. The auth details are stored in the keychain incorrectly. Delete them out of there.
2. SourceTree's default usernames are setup wrong. Check SourceTree preferences and go to the 'network' tab. Delete any entries relating to your remote out of there.
3. Whilst I hate to mention it, there are occasions where users are simply using the wrong username or password, so double check these.

Hope that helps
sourcetree full revision in patch
Asked by tj smith:

When I generate a patch in sourcetree, it doesn't look like it's putting the full revision in the patch. For example, from SourceTree I'll get:

index 19e3ab7..f21414a 100644

But when getting the patch from the command line, I'll get:

index 19e3ab72e04ce4f4f34c45f6f4135ab7904c3441..f21414a48b7105eaec5e8c1570daa47083a6e947 100644

How can I get the full value from SourceTree's patch?


Answers:
author: Christoph Schmidt
body: Same problem here with ReviewBoard. +1 for full revisions.


author: Neo Scorpio
body: +1 for the full revision option. The patch generated can not be used in ReviewBoar. It made me generate diff file in cmd-line.


author: Seth
body: Is there a reason that SourceTree's shorthand is insufficient?


author: tj smith
body: We use ReviewBoard to code review, and it doesn't like the shorthand:

The revision '19e3ab7' for 'file.php' isn't in a valid format: The SHA1 is too short. Make sure the diff is generated with \`git diff --full-index\`.


Tags: windows
Sparse checkout with git and Sourcetree
Asked by Alex Brandt:

Hi,

I have a quite big git repo and my advisor wants to checkout only a few directories from it into his low-storage-macBook using source tree.

Does SourceTree implement sparcecheckout? How can I do it?

Or do we have to do it "by hand" (terminal) and than add the local repo to sourcetree?

The "problem" with the terminal solution is that he also needs to replicate the process in other machines.

Thanks


Answers:
author: dippublic
body: Any success with this ?

comments: author: Alex Brandt
body: Unfortunately no.After this and some other minor reasons, they forced a rollback to svn.


Tags: git
Launch external diff tool for diff between two commits
Asked by Justyn Bussey:

How do I launch the external diff tool for a diff between two commits from within SourceTree?

The diff tool is already setup in the options, and works for single files, but I would like to perform a diff between two commits.

I assumed I could just select the two commits and the right-click context menu would have an option to perform an external diff, but I do not see any option for it.


Answers:
author: Justyn Bussey
body: **Short answer**

The feature isn't available out of the box as of version 1.5.2.0. Which is strange given that every other worthwhile VCS GUI I've ever used had such a feature, especially if they already support per file external diffs.

**Long answer**

I was able to workaround around the deficiency in SourceTree by creating a custom action with the following settings.

*Menu Caption:* External Diff*Script to run:* git  
*Parameters:* difftool --dir-diff $SHA

This assumes you have an external diff tool configured properly in git and that can support directory diffs. I'm using Beyond Compare 3, so my difftool config is:

diff.tool=bc3  
difftool.bc3.cmd='C:/Program Files (x86)/Beyond Compare 3/BCompare.exe' "$LOCAL" "$REMOTE"  
difftool.bc3.prompt=false

The above config follows the suggestions of Timon Wong \[http://theo.im/blog/2012/10/27/directory-comparison-for-git-difftool/\] and Scooter Software technical support \[http://www.scootersoftware.com/vbulletin/showthread.php?t=9449\].

comments: author: hlvtrinh
body: The 'custom action' here doesn't work with SourceTree 2.0.20

Does anyone here know how to update it?


author: bfree
body: It looks like this is option is available at least as of 2.3.5. ctrl+click on the two nodes you want to compare, and then click the gear icon on the right side below the history graph. Select 'External diff'
SourceTree add a network MacOS
Asked by roxanne sutton:

the only options I have under Preference \> Network are to "edit" or "remove" how do i "add" a hostname?


Answers:
author: KieranA
body: Hi Roxanne,

A host gets added when you perform an operation with Git/Mercurial, such as clone. SourceTree will prompt for auth details which then get added to the list of hosts.

Cheers


author: roxanne sutton
body: Thank you, once I added a repository, in it's settings I can new add, or edit
Back to master is impossible
Asked by J?rgen Gintenreiter:

I changed the branch and now i want to go back to the master. But this seems to be impossible. What can i do in such a situation. I tried with pulling and pushing, but it takes no effect.

How can I handle such a situation?


Answers:
author: Justyn Bussey
body: I'm going to just assume this is for a git repository in SourceTree, and not a mercurial repository in SourceTree or some JIRA plugin that manages a repository.

To switch your working copy from one branch or commit to another, you're looking for the **Checkout** command.

\[http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging\]


Tags: branch
SourceTree does not run on Windows 8.1?
Asked by Michiel Vermandel:

After installing SourceTree 1.5.2 on Windows 8.1, I get a crash when I try to run it:

Problem signature:

Problem Event Name:BEX64

Application Name:SourceTree.exe

Application Version:1.1.0.0

Application Timestamp:521396fb

Fault Module Name:StackHash_e7de

Fault Module Version:0.0.0.0

Fault Module Timestamp:00000000

Exception Offset:PCH_77_FROM_ntdll+0x0000000000096B2A

Exception Code:c0000005

Exception Data:0000000000000008

OS Version:6.3.9600.2.0.0.256.4

Locale ID:2067

Additional Information 1:e7de

Additional Information 2:e7debde6e66874f623b9dcd1ed9d155f

Additional Information 3:6350

Additional Information 4:6350aff138e3330645ebe7c155222de5  
How can I fix this issue?  
Thanks!


Answers:
author: Michiel Vermandel
body: I found a path towards the solution.  
I found this: [](http://social.technet.microsoft.com/Forums/windowsserver/en-US/99a19251-5165-4b2b-98d2-a4f0774b54f8/server-manager-crashes-after-upgrading-from-windows-server-2012-to-2012-r2?forum=winservermanager)<http://social.technet.microsoft.com/Forums/windowsserver/en-US/99a19251-5165-4b2b-98d2-a4f0774b54f8/server-manager-crashes-after-upgrading-from-windows-server-2012-to-2012-r2?forum=winservermanager>

It seems that the Intel HD4000 Graphics chip can cause this issue.  
I have a HD4600 Graphics chip in my HP Z-Book.  
If I disable this device, then sourcetree is working properly.  
Now I'll have to find a fix for this Graphics driver issue...

comments: author: Seth
body: Good find. If you do find a fix so you can re-enable the graphics chip, please post it here as well.


author: Michiel Vermandel
body: I uninstalled the device in the device-manager and restarted.

After restarting, the device used a generic Microsoft driver.

Then I downloaded the latest driver from the HP support site, installed and restarted.

SourceTree is now still running OK and I've got my advanced Graphics features back.


author: Jason Steele
body: I had the same issue, disabling the HD4600 device in control panel and then Sourcetree started again no issues. My external monitors stayed on (due to the NVIDIA driver pairing) but my z-book monitor will not display. Quick and easy solution, but I hope they find a fix in the near future. Thank you Michiel!
Why can I see only partial history from "log selected"?
Asked by Eli_Zarka:

I meant that if I select "log selcted" from a file in a specific commit, I will see the file history of this file up to this commit.

How can I see changes of this file after the commit?

Thanks.


Answers:
author: Seth
body: I recommend using the File Status tab, "Show All", and type the name of the file in the top search bar.


Tags: history
Is it possible to jump to the direct children of a commit?
Asked by casebash:

In Sourcetree, it is possible to jump to the parents of a commit. However, I want to go the other way, from a parent to a child. If the tree is small, then it is easy to just follow the tree up manually. However, if the tree is large, it can involve quite a large amount of scrolling. Is it possible to jump to the parent of a commit?


Answers:
author: Mark Botting
body: I've been looking for this feature too.

comments: author: mcapodici
body: me too
ST trying to do preview of mdf and log.ldf files !!!?
Asked by Jasmin Ibrisimbegovic:

Is this software really so stupid or its just my ignorance.

How do I tur off file preview ?  


Answers:
author: Jasmin Ibrisimbegovic
body: Actually I did want to just Ignore those files, but ST start preview and crashed.

also you said:

\>you should be able to right click \> ignore them in SourceTree.

Well its not possible. You have first choose "Stop tracking" and then you have "Ignore" option

comments: author: Seth
body: Ok. If "Stop tracking" is an option, then those files are already committed to Git. The only way to ignore changes to them is to tell Git to stop tracking them, which will delete them from the repository, but not your working copy.


author: Seth
body: I see.

Versioning active database files is a very bad idea. If you want to use Git (or any other versioning system) to store past versions of your database, you should do so with database backup/dump files (.sql), not the actual database files themselves.

If you do not actually want to version these files, but they are located in your working copy, you should be able to right click \> ignore them in SourceTree.

The main problem is that the files you are currently versioning represent part of a specific runtime state of your database. They depend on matching states in other parts of the system, such as other files (which you may also be versioning), but also potentially system data that could be stored in the registry or elsewhere.

Secondly (as you've discovered), storing binary database files completely prevents you from being able to preview or diff the files in/between revisions. If a commit message is missing or unclear, it is anybody's guess what changes have actually been made.

<http://stackoverflow.com/questions/12937101/how-to-version-control-sql-server-database-with-visual-studios-git-source-contr>


author: Jasmin Ibrisimbegovic
body: because they are SQL DB files and becasue ST crashes when try to preview them

<http://en.wikipedia.org/wiki/Microsoft_SQL_Server#Data_storage>


author: Seth
body: I have no idea what mdf files are or why it would be stupid to preview them.
Can't edit page -- "App is not responding. Wait or cancel?"
Asked by Nick Hodges:

I cannot edit a page that I 100% have edit rights to.  

Apparently it is because in the upper right section of the page there is a spinner spinning with the words "App is not responding. Wait or [cancel](https://checkmarx.atlassian.net/wiki/spaces/CXMAR/pages/6792053090/Developer+Workshops#)?" sitting next to it.

Clicking the "cancel" does nothing.  

Letting it sit overnight waiting does nothing.  

It just spins and spins and never lets me edit.


Answers:
author: Andy Gladstone
body: [@Nick Hodges](/t5/user/viewprofilepage/user-id/5262069) Welcome to the Atlassian Community. Sorry you crash landed. How long has this been going on? Confluence (Atlassian) has been experiencing major degradation of service on the Cloud Platform in many regions over the past 24 hours - has this issue persisted longer than that?

comments: author: Nick Hodges
body: Hey -- thanks for getting back with me!  

This has been a problem for several months now. It's not a new thing, no.


author: Andy Gladstone
body: OK then - let's go through some troubleshooting steps. This may be related to your browser or cache and not a Confluence Cloud issue. The only reason I make that assumption is the fact that the editor never seems to load as yo describe.

1. Is this issue on a single page or all pages in your cloud instance?
2. Does this issue persist on multiple browsers?
3. Do you have the same issue when accessing the page via mobile?
4. Have you attempted this in incognito mode?
5. Have you tried clearing the browser cache and accessing the page to see if your edit ability is restored?

Let's start with these steps and then tackle it further if your edit capability is not restored.


author: Nick Hodges
body: Hey, thanks again for working on this with me.  

1. It appears on every confluene page I open.
2. it happens on Chrome and Firefox
3. No, I don't see it there, but neither can I edit the page as far as I can tell.
4. I just did, and the problem happens there.
5. Yes, no luck.

Nick


author: Andy Gladstone
body: [@Nick Hodges](/t5/user/viewprofilepage/user-id/5262069) it sounds like there can either be an app installed in your instance that is not responding or potential corruption in your instance. At this point I suggest you open a ticket with Atlassian Support so they can gain access to your environment and assist. You have support bundled with your contract for Standard.

<https://support.atlassian.com/contact/#/>

Please come back here and update us once you know what the issue is/was and what the fix is/was.


author: Nick Hodges
body: Well, I'd do that, but we apparently don't have a support contract, so they are sending me here. :-\\


author: Andy Gladstone
body: On Standard (which you indicate in this post) you should be eligible for Local Business Hours Support.

<https://www.atlassian.com/software/confluence/pricing>

Can you confirm you are on a Standard License?


Tags: cloud

confluence-cloud
Why when approving a workflow with comala it does not change state in the second flow, the first tim
Asked by Rodrigo Uribe:

Why when approving a workflow with comala it does not change state in the second flow, the first time


Answers:
author: Jamie Esker _Appfire_
body: Hi [@Rodrigo Uribe](/t5/user/viewprofilepage/user-id/5262053) ,

I am the Product Marketing Manager for Comala Document Management, and I'm sorry to hear you're having difficulty! I suggest [contacting our support team](http://%20https://support.comalatech.com/). They can help identify the issue with your workflow and get it to work the way you intend it to.

Jamie Esker


Tags: confluence-server

server
Admin Acess
Asked by start new:

I lost my admin access to my confluence due to the fact that the email tied to my admin is now disabled.  
Please how do I get back admin to my confluence with my new email address?


Answers:
author: Sayed Bares [ServiceRocket]
body: [@start new](/t5/user/viewprofilepage/user-id/5261922) welcome to the community!

You would need help from other admins to grant you administrator access


Tags: cloud

confluence-cloud
Agile Wallboard Gadget not pulling Board
Asked by saral:

Hello! We have a confluence page that we show to one of our customer teams that includes a summary, a gadget which includes the roadmap/timeline, and the Agile Wallboard Gadget set to pull from our Board. This usually updates every 30 minutes or so and includes everything on the current Board/Sprint.

However, today we started a new sprint, and now the Agile Wallboard Gadget shows "No issues here", however we have about 15 items in the Sprint.

DId something change with this board? The settings are pretty minimal so I am not sure how to actually address this. :( Please help!


Answers:
author: duhyeon kim
body: Hello All,  

I have been experiencing a similar problem since last Thursday. I have set up a Confluence Agile Wallboard Gadget to fetch data from the agile sprint board configured in Jira software. It was working fine, but starting from last Thursday, the data is not being displayed as below image but there are 43 story type issues in the sprint.  
![Screen Shot 2023-07-11 at 3.14.44 PM.png](https://community.atlassian.com/t5/image/serverpage/image-id/267920i775635E859E728A1/image-size/large?v=v2&px=999 "Screen Shot 2023-07-11 at 3.14.44 PM.png")

Is it true that the Confluence Agile Wallboard Gadget has been discontinued? If there is any related link available, I would appreciate it if you could let me know.  

Is there any way or workaround to make it work properly again?  

<br />

Thank you.


author: Danut M _StonikByte_
body: Hi [@saral](/t5/user/viewprofilepage/user-id/5178089),

Some time ago, Atlassian announced that this gadget will be discontinued...

![image.png](https://community.atlassian.com/t5/image/serverpage/image-id/267321i82E949DF899825EE/image-size/large?v=v2&px=999 "image.png")

As an alternative, you can use the **Team Wallboard gadget** offered by our [Great Gadgets](https://marketplace.atlassian.com/search?query=great+gadgets+stonikbyte+agile) app. It is highly configurable (including colors), supports quick filters and swim-lanes.

![](https://blogstonikbyte.files.wordpress.com/2022/01/image-8.png?w=875)

This app offers many other gadgets that you will find useful.

Thank you,

Danut M.

comments: author: saral
body: Thanks [@Danut M _StonikByte_](/t5/user/viewprofilepage/user-id/502420) , I am still a little perplexed though, because this was announced by Atlassian back in 2021 as far as I can tell, and it was working for me up until I ended my most current Sprint and started a new one. My sprint, I promise, was not 2 years long.

I am really just looking for why it works for some issues/projects and not others.


author: Markie Wilcox
body: I only found this thread after posting a similar question. Adding a comment so I can stay updated on any replies to this one.


Tags: cloud

confluence-cloud