youngmon/atlassian-qna huggingface dataset:
Setup SourceTree with Stash and Pull Requests
Asked by Gyana Ranjan Kar:

Hi,

Lets say i have some uncommitted local file changes and same time someone pushed the same changed or conflicted file.

Before committing my changes, i did a pull what are the latest changes available in remote then i ran in to pull failed with conflict issue without showing to resolve with both local and remote one

How to deal with this above situation

I know i can commit that first and do a merge with latest changes but is there any way without doing commit i can do merge or conflict resolution by my own?

Any solution is greatly appreciated.

Thanks


Answers:
author: minnsey
body: Hi  

I would expect the pull to have worked and shown the conflicts locally, can you screen shot what happens.  

However the other way around this would be to Stash you local changes and then pull and then re-apply your stash over the top.


Tags: git

windows
Javascritpt enable message
Asked by javier.pariente.contractor:

Hi,

whenever I try to start SourceTree I get the following message.

![image.png](/t5/image/serverpage/image-id/10189i3250CF2FB430C0F6/image-size/large?v=v2&px=999 "image.png")

Please, could you help me to solve this problem?

Thank you


Answers:
author: Ana Retamal
body: Hi Javier! I'm afraid the screenshot is too small and I'm not able to read the message you're getting. Could you try to re-attach it and make sure it's a bit bigger? Also, please tell us which Sourcetree and OS version are you using, to give us a bit more context :)

Saludos!

Ana

comments: author: Ana Retamal
body: Hi again, Javier! I've just seen another user mentioning a similar problem, so I guess it might be related to yours.

Can you follow the steps at [How to enable Javascript in Windows](https://support.microsoft.com/en-us/help/3135465/how-to-enable-javascript-in-windows) and see if the message goes away? You can also try adding that website to Trusted sites in your browser.

If the error persists, please let us know which version of Sourcetree and IE are you using.

Cheers!

Ana


Tags: javascript
error in installing source tree for windows
Asked by amalAlkronz:

Hi there, could you help me in this problem?  
[https://ibb.co/eVdA9b](https://ibb.co/eVdA9b "error")**P.S.:Javascript is enabled in all browser in my pc and I installed the last version for windows**


Answers:
author: Ana Retamal
body: Hi Amal, this might be caused by your current security settings. Sourcetree for Windows relies on Internet Explorer in the background, can you confirm you've followed all the steps in the article [How to enable Javascript in Windows](https://support.microsoft.com/en-us/help/3135465/how-to-enable-javascript-in-windows)? You can also try adding that website to Trusted sites and see if that error goes away.

If it doesn't, please let us know which version of Sourcetree and IE are you using.

Best regards!

Ana
Is there any limit for submoduls in a repository?
Asked by Ulrike Borinski:

I try to build a repository with 110 submoduls. I added 91 and now i can't see any of them in the sourcetree window ...


Answers:
author: Ulrike Borinski
body: Now I know the workflow:

I had to delete the folder first, than to delete the entry in the .gitmodule via sourcetree. Than everybody has to delete the folder and after that to pull the new commit.

The list of submodules is OK than, but I had to talk physically to everybody, who uses the submodule-repository.

greetings

Ulrike


author: Ulrike Borinski
body: Good morning,

thanks for your answers, I changed my preferences. Because nothing changed, I built a new repository and added all my submodules. I can see them until I had to delete one (context menu). Then the list of submodules disappears ...

The entry in .gitmodule was deleted, but the folder not. I deleted the folder by myselve and pushed. It looks ok -- on my computer. If I pull this on a second computer I get an error. Somethong like: Difference between Folder and .gitmodule ...

Ulrike

comments: author: minnsey
body: Thanks for the update I've created <https://jira.atlassian.com/browse/SRCTREEWIN-8313> to track this.


author: minnsey
body: Hi  

There shouldn't be any limit.  
We tend to test using <https://github.com/boostorg/boost.git> which has \~130 submodules.  

Where you adding the submodules through Sourcetree?   

Can you post a screen shot?

comments: author: Ulrike Borinski
body: ![submodul-hidden.png](https://community.atlassian.com/t5/image/serverpage/image-id/10271iD3D20E716E444002/image-size/large?v=v2&px=999 "submodul-hidden.png")


author: Ulrike Borinski
body: Good morning,

the screenshot shows 3 windows: part of \>\>.gitmodules\<\<, part of files and part of the sourcetree-window -- not showing one of the modules ...

Now I tried to remove (delete) the repository to take it as a new one. I got all the folders, but all of them empty. If a clone one of them, I recieve the files -- but it looks like I have to reorganize it all new ...

Ulrike


author: minnsey
body: Hi Ulrike  

The behviour you describe is correct, By default Sourcetree will no longer automatically clone all the submodules. This is due to the following security issue in Git.  

<https://nvd.nist.gov/vuln/detail/CVE-2017-1000117>  

You can re-enable to option in the Sourcetree preferences.


author: bgannin
body: Mike is correct, you'll find this setting in *Preferences -\> Git -\> **Perform submodule actions recursively***

Brian Ganninger  
Senior Mac Developer, Sourcetree


Tags: submodule
SourceTree is not pulling the current version.
Asked by Layne Clemen:

I am having issues with connecting SourceTree to a repository. I am pulling the current iteration of the code and SourceTree shows all of the correct information, however, when I navigate to the folder that I have specified for the repository it seems like it is saving a version of the code that is over 1 year old. Is there anyway to check where a file is in SourceTree? Is there a setting for which version of the code I should be pulling?


Answers:
author: Ana Retamal
body: Hi Layne, you can find the file (or the location of the file) by going to the **File status** menu, right-clicking on one of the files and selecting **Copy path to clipboard** or **Open in terminal** in the menu.

If you need further assistance, remember to let us know which Sourcetree and OS version are you using :)

Cheers!

Ana

comments: author: Layne Clemen
body: Ana,

I did what you said and the files and file structure that SourceTree claims is there only partially exists. It seems like it did not pull all of the data from the repository.

I am using Windows 7 and Sourcetree 2.3.5.0.

Thanks, Layne
Can't log in to SourceTree
Asked by burakdeniz:

I can't login to SourceTree with my Atlassian Account on Windows. But i've tried on macOS and it works. I did not understand this situation.


Answers:
author: Ana Retamal
body: Hi Burak! Sourcetree for Windows relays on Internet Explorer for logging in, can you check you have an updated version of IE?

If you're still having trouble to log in, can you be more specific about the error you're getting and send us a screenshot so we can get a better idea of what's happening? Remember to tell us also which version of Sourcetree are you using.

Cheers!

Ana

comments: author: burakdeniz
body: Hi Ana,

First of all thanks for the answer. Version number is 2.3.5.0 so it's latest version of Sourcetree.

The computer that i've tried is my job computer. I can't go into internet explorer settings. When i click continue it's stuck at the screen below. I guess I need to try it on my personal computer. When I try, I will report it here.

Thanks Ana.

![Capture.JPG](https://community.atlassian.com/t5/image/serverpage/image-id/10150i95CF2BC3622DBBF2/image-dimensions/189x296?v=v2 "Capture.JPG")


author: Ana Retamal
body: For that issue I'm afraid it will be necessary to change something in Internet Explorer:

* Turn off compatibility mode in IE. To do that, open Internet Explorer, go to the *Advanced options* tab and click on *Reset your Internet Explorer Settings*
* Check *Delete personal settings*
* Change your Internet Explorer Security Zone Settings:

1. Open IE, click on the gear
2. Select "Internet Options"
3. Select the "Security" tab
4. Select "Custom Level" for Internet
5. Find "Access data sources across domains" and select "Enable" (make note of what the setting currently is)
6. Try logging into Sourcetree again

After logging in, follow steps 1-5, but ***reset the setting back to the previous option***.

Let us know if you need anything else!

Regards,

Ana
All projects disappeared from SourceTree
Asked by Sharmin Azam:

All my project suddenly disappeared from Source Tree. The projects are there in disk and in Eclipse. It's not showing anything in SourceTree. I have to clone and setup all projects as I can't push anything to git anymore. Very very disappointed. All my work projects are gone.


Answers:
author: Ana Retamal
body: Hi Sharmin, did you perform any operation that could have triggered this? Did something change in your machine?

Also, what do you mean that you can not push anymore? What happens if you try pushing directly from the command line?

Sourcetree is just an interface for git, so unless you deleted something on disk, nothing should be lost, so you should be able to find them again and re-import them to Sourcetree.

Let us know!

Ana

comments: author: Sharmin Azam
body: I did not perform any operation in SourceTree on the day it happened. I had to hard reboot my desktop for something. The next time when I opened SourceTree it's blank. Not sure how that will cause this. I can do git operations from command line.


author: Sharmin Azam
body: Re importing same project from disk to SoureTree, is not showing already changed files as changed files in file status tab.


author: Francois_Verstraeten_s4
body: The same has been happening to me also. I added a project this morning. I rebooted my PC and now you can not see the project in Sourcetree anymore. But it is still in my projectfolder with ALL its content. I can still see the rest of my project on Sourcetree.

This is not the first time this happened. Does anyone have a solution to this please?
Sourcetree and Visual Studio 2015
Asked by Ian Lienert:

My team has a repository of many C#/.NET projects coded in Visual Studio 2015 and we are trying to migrate our codebase from SVN to Git hosted on Bitbucket. One thing I'm struggling with after the migration is how to cleanly switch between tags using Sourcetree. The problem is that when I compile and run my application from master, many DLLs and other binaries are generated in my project folder. If I then checkout a new tag on Sourcetree (with "Clean (discard all changes)" selected), I can see all of my DLLs are still there and rebuilding and running the application can result in some weird behaviour that can only be explained by having the old DLLs in there.

Basically, my question is: is there a way to checkout a tag in Sourcetree truly cleanly so that the state of the repository is just as if I freshly checked out the repo from remote and then immediately switched to a new tag?


Answers:
author: Ana Retamal
body: Hi Ian, afaik that's what should be happening. You might want to have a look at *git clean* , although this is a command that needs to be run in the command line, as it's not implemented in Sourcetree. You can read more about it at [git-clean](https://git-scm.com/docs/git-clean).

Hope that helps!

Ana

comments: author: Ian Lienert
body: Thanks Ana. I think the problem is that it is not *git clean-*ing my ignored files. Is there a way to force a clean of everything including ignored files? I think TortoiseGit handles this by passing -fx to the clean command. Not sure how this is done in Sourcetree.


author: Ana Retamal
body: Hmmm, so you mean that you have ignored files that are still appearing? Keep in mind that if the files have already been tracked, .gitignore will not prevent them from being added. This means, if the files were tracked before, they will continue to be tracked, to stop tracking a file you need to remove it from the index, you can achieve this with the command:

git rm --cached \<file\>

The removal of the file from the head revision will happen on the next commit.

Let us know if that's what you meant :)

Cheers,

Ana


Tags: bitbucket

visual-studio
Dark Theme Turns White After Commit
Asked by Bruce Brophy:

The File Status view in sourcetree turns white each time I push a commit. I;m forced to go into preferences and reset it to white and dark again.

![Screen Shot 2017-11-27 at 12.54.11 PM.png](https://community.atlassian.com/t5/image/serverpage/image-id/10053iC260E7D843FBDBC9/image-size/large?v=v2&px=999 "Screen Shot 2017-11-27 at 12.54.11 PM.png")


Answers:
author: bgannin
body: This is a known issue specific to High Sierra: <https://jira.atlassian.com/browse/SRCTREE-5067>
Recovery of Confluence page post migration to Confluence cloud
Asked by Jaspreet Huda:

Hi team,

I require assistance with the recovery of the Confluence page

After our migration to Mastercard Confluence from Finicity, I am unable to access this document, which was originally in my personal space.


Answers:
author: Ste Wright
body: Hi [@Jaspreet Huda](/t5/user/viewprofilepage/user-id/5376782)

This is a public community, so I've removed the link from your post.

I'd first check with your internal IT/Admin Team, to see if they can help recover this page. It might require reworking of the migration, or could be a simple issue like its become restricted content.

If you are the Admin though, you could also contact [Atlassian Support](https://support.atlassian.com/contact/#/) for more assistance.

Ste


Tags: confluence-cloud

unknown-hosting-type
Getting error on Push to remote...
Asked by Richard Albrecht:

How do I fix this error?

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree push -v --tags --set-upstream MemberTree1 refs/heads/HEAD:refs/heads/HEAD

Pushing to https://Hawkcode@github.com/Hawkcode/MemberTree1.git

error: src refspec refs/heads/HEAD does not match any.

error: failed to push some refs to 'https://Hawkcode@github.com/Hawkcode/MemberTree1.git'

Completed with errors, see above


Answers:
author: Richard Albrecht
body: Surely some one knows how to correct this. If not can anybody point me to someone who can?

Thanks


author: bgannin
body: What version of Sourcetree are you using? What OS are you on?

comments: author: Richard Albrecht
body: Sorry..

2.6.3 (134)

Mac OS High Sierra
How to create a vendor contact list in confluence
Asked by sunny.tailor:

I want to create a contact list of all our vendors with name, email, phones number like i would create in a excel temple but want to do it directly from confluence,


Answers:
author: Michel Neeser
body: Hi [@sunny.tailor](/t5/user/viewprofilepage/user-id/5376707) and welcome!

I think a simple table in Confluence would do the trick for this requirement. Please have a look at [this post](https://community.atlassian.com/t5/Confluence-Cloud-articles/How-to-Work-With-Tables-in-Confluence-Cloud/ba-p/1718038).

Let me know if this helps.


author: Shardul Juyal_Addteq_
body: Hi [@sunny.tailor](/t5/user/viewprofilepage/user-id/5376707)

You can create the table in Excel and simply copy paste the data in Confluence. Especially if the tables does not need to be updated frequently.

However if you want to update the table within Confluence you can have a look at our [Excellentable](https://marketplace.atlassian.com/apps/1211672/excellentable-spreadsheet-for-confluence?tab=overview&hosting=cloud) app, and work on spreadsheets within Confluence.


Tags: cloud

confluence-cloud
I am unable to remove the "draft" in my page title
Asked by Erin Bailie:

I wrote a page a few weeks ago and I titled the page "\[draft\] Page Title", not realizing that putting draft in brackets like that would save the page as a draft.

Now, I want to remove the "draft" from the page title, but when I select "Edit" for the page, the page title is shown without the "draft" text, so I cannot delete it. The page has been published, yet it is still shown as a draft in the side bar.

I worry I've gotten myself stuck in a loop where the text in the title is causing Confluence to tag the page as a draft, but I cannot remove that text from the title!


Answers:
author: Erin Bailie
body: Interesting. The draft does *not* show up in Recent \> Drafts, nor does it appear when I select "view all drafts".

This is how it appears in the left rail:

![Draft shown in title.png](https://community.atlassian.com/t5/image/serverpage/image-id/295027iB7A2702DC685FB75/image-size/large?v=v2&px=999 "Draft shown in title.png")

But then when I open the page to edit, the \[draft\] at the beginning isn't show in the title:

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

comments: author: Erin Bailie
body: [@Jack Brickey](/t5/user/viewprofilepage/user-id/853369) oh no! I meant to reply to you but accidentally left a comment on the post. The Atlassian Community throws an error when I try to post the same thing as a comment on your post. Let's continue the conversation here.


author: Jack Brickey
body: [@Erin Bailie](/t5/user/viewprofilepage/user-id/5376734) , Well, that is quite the paradox. I just tested the very same (?) Process, and was successful in removing the draft out of the title. Here with the steps, I followed :

1. I created the page with the \[draft\] in the title
2. I closed the draft and verified it shows as a draft
3. I edited again and published and verified that, despite \[draft\] was still in title, the draft designation was gone.
4. I edited again and was able to delete the \[draft\] from the title.

my conclusion is that "\[draft\]" in the title does not result in a draft designation.

if you click on Recents in the main menu and then choose Drafts does the page show there?


Tags: cloud

confluence-cloud
Naming different pages with same name under same Space
Asked by Humberto Marasi:

How can I create separate pages that have the same name? Without having to create unique names for each page. Example:

Product 1

* Introduction
* Roles an Responsibility
* System Details

Product 2

* Introduction
* Roles an Responsibility
* System Details


Answers:
author: M?rten Woxberg
body: I'd suggest naming them

Product 1

* Introduction - Product 1
* Roles an Responsibility - Product 1
* System Details - Product 1

Product 2

* Introduction - Product 2
* Roles an Responsibility - Product 2
* System Details - Product 2

That way if you search for Introduction you won't get several pages with the same title in your search results and you'll know instantly what introduction it's about.


author: Ste Wright
body: Hi [@Humberto Marasi](/t5/user/viewprofilepage/user-id/5376684)

Natively, this isn't possible - there have been feature requests for this, such as [CONFSERVER-2524](https://jira.atlassian.com/browse/CONFSERVER-2524)

You'll need to either...

* Use a prefix (eg. P1:, P2:, etc)
* Use an App that allows for this functionality - such as [Duplicate Page Titles (Same Page Titles)](https://marketplace.atlassian.com/apps/1219390/duplicate-page-titles-same-page-titles?hosting=datacenter&tab=overview)

Ste


author: Dave Mathijs
body: Hi [@Humberto Marasi](/t5/user/viewprofilepage/user-id/5376684) welcome to the Atlassian Community!

Page titles in the same space need to be unique.

There cannot be two pages with the same name in your space.

So you'll need to use some kind of distinctive prefix or numbered headings.


Tags: confluence-server

server
When using two dimensional chart Jira macro, can I show sprint data across multiple projects?
Asked by atla pani:

I have several projects that use the same sprint label, such as "2023_12". When I create a two-dimensional chart, I set the x-axis as the sprint and the y-axis as the project. However, when I run the report, it displays all the projects correctly, but it shows multiple columns with the same sprint name - one column per project. I would like to filter this view to show only one column for a particular sprint. Can you suggest a way to achieve this?


Answers:
author: Laurie Sciutti
body: Hi [@atla pani](/t5/user/viewprofilepage/user-id/5376656) and welcome to the Community! Sprints are stored in the DB as an ID (numerical) rather than as text so when you report on it, even though the sprint "name" may be the same, they are still considered different sprints. This is by design so that teams in one project can name their sprint the same as a team in another project.   

That said, I'm not sure you can distinguish that in the 2-dimensional filter Jira macro. One solution (though not pretty) may be to create an automation that adds a label to issues with the same sprint name then report on that label (instead of the sprint). HTH but I'm curious if anyone else has another approach to this....


Tags: cloud

confluence-cloud
IS there an app to be able to switch user in Confluence cloud version?
Asked by Jasna Stefanovic:

We are currently using Data Center version of Confluence and we are migrating to the cloud by mid next year.  
I am researching market place for 'User Switcher for Confluence' and I don't see one.   
Is there one? Is something native available and I am not seeing it?   
Please help :)


Answers:
author: Ste Wright
body: Hi [@Jasna Stefanovic](/t5/user/viewprofilepage/user-id/4678461)

As in, login as another user?

If yes, check out this help page: <https://support.atlassian.com/user-management/docs/log-in-as-another-user/>

Ste

comments: author: Jasna Stefanovic
body: [@Ste Wright](/t5/user/viewprofilepage/user-id/1166470) Thanks Stephen for the link to 'login as another user'. Yes that would be it! Only thing is that we have a free version of cloud confluence and it looks as though in our case only the original admin who span off the space has all the functionality in user management to be able to switch users.

Perhaps I am wrong. Please do respond.


author: Ste Wright
body: Hi [@Jasna Stefanovic](/t5/user/viewprofilepage/user-id/4678461)

You'll need to be an Admin - likely an Organization Admin - to do this. It might also be possible for Site Admins and User Admins.

You could ask the original Admin to set you up as an Admin also?

Ste


author: Ste Wright
body: Hi [@Jasna Stefanovic](/t5/user/viewprofilepage/user-id/4678461)

This is a public community - so best to not post images with your email addresses visible - I've removed the image.

As all users are Admins, you likely can't login as them - but if you had a user who was not an Admin, you should be able to use this feature.

Being a Free instance should not change this.

Ste


author: Jasna Stefanovic
body: Thanks for your help Stephen!


author: Ste Wright
body: No worries!

If this answer helped, could you accept it? That helps others know this answer can help them too :)

Ste


author: Jasna Stefanovic
body: [@Ste Wright](/t5/user/viewprofilepage/user-id/1166470) I am the Org Admin and so are all of us who are testing the Cloud version of Confluence.


Tags: cloud

confluence-cloud