youngmon/atlassian-qna huggingface dataset:
git error during pull
Asked by Elroy Mihailov:

Lately when I do a pull in sourcetree, it just hangs. The error that I get is below. Any ideas?

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree pull --no-commit origin master

git: 'credential-osxkeychain' is not a git command. See 'git --help'.

git: 'credential-osxkeychain' is not a git command. See 'git --help'.

git: 'credential-osxkeychain' is not a git command. See 'git --help'.

git: 'credential-osxkeychain' is not a git command. See 'git --help'.

From [https://bitbucket.\*\*\*\*\*\*\*\*\*](https://bitbucket.*********)

\* branch master -\> FETCH_HEAD


Answers:
author: Elroy Mihailov
body: I'm back to looking at this issue again. I've tried both embeded git and system and neither one will allow me to do a pull on the mac. I've been having to do all sourcetree work through Parlells. Strange that it works on windows through parallels but not on the mac. I've been keeping up with the Souretree updates as well and neither of the last two updates has resolved the issue for me. Any other ideas I can try?


author: KieranA
body: Hey Elroy,

First of all, listen to Jeff if you want to get rid of these 'errors'. This area is actually something I had to get elbow deep in as I was the one dealing with it in SourceTree.

1. It's not actually an error. Git reports many things on the error stream which aren't errors. It's a warning to say that the helper that's set up in Git isn't available because you're using our embedded version.
2. The next version of SourceTree will include an updated version of embedded Git so hopefully you should no longer get this error.
3. You can see in the command that a credential helper is being manually set. This is SourceTree's custom authentication helper which manages your credentials for you. Git has a load of config files that are hierarchical in that it takes on all of the preferences from the git config files, the global one includes the credential-osxkeychain helper which isn't available on SourceTree's PATH for embedded Git.

In short, it's nothing to worry about.

Cheers!

comments: author: Elroy Mihailov
body: I've tried switching to the embeded Git in Sourcetree but still can't seem to pull. Could the embeded git be corrupted in some way? Hopefully the next Sourctree update will come soon.


author: Elroy Mihailov
body: Sorry. This was meant to be a continuation of the above comment and not an answer. I'm back to looking at this issue again. I've tried both embeded git and system and neither one will allow me to do a pull on the mac. I've been having to do all sourcetree work through Parlells. Strange that it works on windows through parallels but not on the mac. I've been keeping up with the Souretree updates as well and neither of the last two updates has resolved the issue for me. Any other ideas I can try?


author: Jeff Thomas
body: Hi Elroy, I believe you can fix this by switching to the system version of Git and not the embedded version.

**Command + ,** -\> **Git** tab -\> **Use System Git**
How do clear/delete "working copy"
Asked by Rolf Marsh:

I tried to make some changes to my app in a new branch. I changed my mind, and now want to delete that branch and working copy contents. How do I do that? (I'm thinking "clone" with a new branch name, make it my current branch, then delete the old branch.) Will this also clear the working copy or make the new clone the working copy?


Answers:
author: Timothy
body: Can't you just return to the master branch and delete the branch?


author: rmmarsh
body: What's the difference between a local branch and "working copy"?

comments: author: Timothy
body: A branch is a branch. Local means its on your client machine. Working copy means a full copy of the repo on your client machine?
SourceTree: can you disable the 'confirm stage' dialog?
Asked by benomatis:

I recently downloaded SourceTree \[Version 1.7.4.1 (1.7.4.1)\] on OS X 10.9 and was wondering if there was a way to disable the 'confirm stage' dialog popping up every time I want to add a file to the Index.

I honestly do not see a use of this dialog as the changes done by adding a file to the index are softer than soft, to my opinion.


Answers:
author: jeanfabre
body: You can disable it in the Preferences:

in Preferences/General/Confirm before adding/removing files

Bye,

Jean

comments: author: benomatis
body: This must have been added recently; it defo wasn't there when I raised this question.


author: jeanfabre
body: most likely yeah :)


author: Harry Fytrakis
body: Is there an equivalent option for the Windows Version?  
I'm using 1.8.3.0


author: jeanfabre
body: I can't say, I am not working on Windows, sorry :smile:


author: Mihai Morcov
body: On Windows you have Tools \> Options \> General \> 'Always display full console output' - maybe not the same thing but could help someone.


author: Harry Fytrakis
body: Thank you for your input!


author: Kevin Scharnhorst
body: Is there still no option to disable the confirmation dialogs that appear when discarding lines and hunks from a diff? Usings SourceTree for Windows v3.2.6


author: jeanfabre
body: I would also like this, it's really annoying after a while... :)


author: sschilz
body: Hear Hear! I would love to see an option for this as well.
English version
Asked by mheon:

My Computer is in french but i'd like to have the english version of Source tree. I think it sets by default to the computer's language...?

How can i change this?

Thanks


Answers:
author: Rahul Aich [Nagra]
body: This has been discussed earlier in answers. have a look at the link below

[https://answers.atlassian.com/questions/15275/how-can-i-switch-the-language-from-french-to-english](/questions/15275/how-can-i-switch-the-language-from-french-to-english)

rahul
Odd lines of Sourcetree graph illegible
Asked by Jan Willem B:

In the SourceTree graph, SourceTree uses a white background for the odd and a blue background for the even lines. The font color is also white, so I am unable to view the text of the odd lines: only highlighting the line will make the background blue and the font visible.

I recently installed sourcetree, and I did not change any font or color settings. I use the default Windows 7 theme settings.

How can I fix this?


Answers:
author: Jan Willem B
body: I found the solution today: install VS2013, which somehow fixes this.


author: Anne Manning
body: An [Uk seo company](http://www.firstoneseo.co.uk) ENGINE OPTIMISATION Corporation is mostly misunderstood as traffic machines. A fantastic SEARCH ENGINE OPTIMISATION means to take suited as well as applicable traffic in your web page, building a


author: Jan Willem B
body: This is the same question, also without answer: <https://answers.atlassian.com/questions/227829/white-font-bug-in-history-view>


Tags: user-interface
SourceTree hangs when pushing to github
Asked by Mike Ottinger:

Hi, I have SourceTree 1.7.4.1 on mac os 10.7.5 pointing to a github project. Every time I go to push my changes to it, SourceTree will hang. I changed the preferences to always output the git logs as each command is invoked to see which was the command it get's stuck on. The last command it runs is 'updating local tracking ref 'refs'remotes/origin/master'. I should mention, even if it hangs, the changes to make it to github. Any ideas on what might be going on here?

Thanks!


Answers:
author: Mike Ottinger
body: Hi Kieran, good news! I followed your link on troubleshooting performance problems, followed the advice to upgrade my system git. This solved all my problems. I should have thought earlier to do this :)

comments: author: KieranA
body: Glad it worked Mike!


author: KieranA
body: Thanks for getting back to me. Could you open an issue on [jira.atlassian.com](http://jira.atlassian.com) and go through the following article reporting all of the required details in the article? <https://confluence.atlassian.com/display/SOURCETREEKB/Troubleshooting+Performance+Problems+in+SourceTree>

Thanks very much in advance


author: Mike Ottinger
body: Fortunately this isn't an intermittent problem, it happens everytime, with small and large commits.


author: Mike Ottinger
body: Fortunately this isn't an intermittent problem, it happens everytime, with small and large commits.


author: Mike Ottinger
body: Hi Kieran, no hooks that I'm aware of. Checking github, there are service hooks available, none of which I have enabled. On the SourceTree side, I see nothing as well.

comments: author: KieranA
body: Do you know if it's a big commit? I recently had to do some very large commits and they did indeed take a long time.


author: KieranA
body: Hey Mike,

Have you got any hooks set up? Any time this has ever happened to me it's because of hooks that can't execute when being run from SourceTree as it doesn't have access to the PATH, in which case they just fail with no output.

Cheers
Forgot to add file on old commit
Asked by Jesse Seger:

Hello

I'm using SourceTree and I forgot to add a file to a previous commit - about 3 or 4 commits ago. How can I inlude this file in the desired commit?


Answers:
author: Jeff Thomas
body: Hi Jesse,

You can use rebase to do this.

1. Commit the files that you forgot to add
2. Right-click on the parent commit of the commit you'd like to add the files to and click **Select Rebase children of \<SHA1\> interactively...**
3. Use the arrows at the bottom to move the forgotten files commit so that it is above the commit you'd like to add them to
4. Make sure the forgotten files commit is selected and click the **Squash with previous** button
5. If you'd like, you can then edit the commit message with **Edit message**
6. Select **OK**

comments: author: Jesse Seger
body: Thanks for the reply Jeff. I should've specified this is a Windows install. I do not see Select Rebase children in the context menu. I can share a screen shot it you'd like.


author: Jeff Thomas
body: It looks like the Windows version does not support interactive rebasing (<https://jira.atlassian.com/browse/SRCTREEWIN-405>) yet. I don't know of another way to do this in SourceTree, but maybe someone else will.

You could also try to rebase with the command line - <http://stackoverflow.com/a/2719636/1133218>


author: Jesse Seger
body: Thanks Jeff.


author: Jacqui Read
body: Just a note to say that SourceTree for Windows does now support rebasing children interactively (I am using 1.6.10), so the above method now works.


author: Jesse Seger
body: Awesome. Thanks Jacqui!!


author: Tom Auger
body: Looks like you can do it, at least in version 1.6.18.0 on Windows: Stage (add) your changes, as if you were going to perform a new commit. Then under "File Status" put your cursor into the Commit message box to open up the full commit pane. Top right choose from "commit options..." and select "Amend latest commit". You then get to copy the message from the previous commit into the message box, edit it if you want and commit. It performs a \`git commit --amend\` for you and voila - the previous commit is amended. Loverly.

comments: author: JanOonk
body: Thanks I can confirm this (also) works great in v1.8.3 on Windows


Tags: windows
Delete a new product
Asked by RedaAz:

I have just started a new 7-days trial product of confluence. At the same day I have decided to stop this trial so I have deleted the product but the pages still there. I read that the deletion process could take till 14 days. In this case, what could man do? Have I to pay for the difference period?


Answers:
author: Andy Gladstone
body: [@RedaAz](/t5/user/viewprofilepage/user-id/1999131) if you already deleted the product in the billing portal under the Atlassian administration panel, you should not be billed for it. If you want Atlassian to purge any pages that were created - which should be inaccessible once your trial period ends, you can open a ticket with [Atlassian Support](https://support.atlassian.com/contact/#/) to request permanent deletion.

Hope this helps.


Tags: cloud

confluence-cloud
How can I place text and image over image, it is possible in confluence?
Asked by Manikanta Gottuparti:

In MS Word to design a cover page or first page, I keep text and image over Image.

is it possible in Confluence?


Answers:
author: Andrii Maliuta
body: Hello [@Manikanta Gottuparti](/t5/user/viewprofilepage/user-id/5250628) ,

For images, it is possible to add Captions and Alt Text only.

For some more complex representations, custom addons can be used, like [DrawIO](https://marketplace.atlassian.com/apps/1210933/draw-io-diagrams-whiteboards?hosting=cloud&tab=overview) or [Lucid Charts](https://marketplace.atlassian.com/apps/350288/lucidchart-diagrams-connector?hosting=cloud&tab=overview) to create diagrams, charts, images with text , etc.

It can be possible to create custom addons/macros to do such things, but you need to know how to develop apps for Cloud (<https://developer.atlassian.com/cloud/>) , <https://developer.atlassian.com/platform/forge/getting-started/>


Tags: cloud

confluence-cloud
Daily activity report in confluence
Asked by Praveen P:

Our organization need to get a single report/digest mail on daily activities in confluence.

Is their any possibilities in getting a single digest mail/report


Answers:
author: Levente Szabo _Midori_
body: [@Praveen P](/t5/user/viewprofilepage/user-id/5178756) [Better Content Archiving for Confluence](https://marketplace.atlassian.com/apps/123/better-content-archiving-and-analytics-for-confluence?hosting=cloud&tab=overview&utm_campaign=gh&utm_medium=cac-comment-2396943&utm_source=cac) provides flexible notification automation that you can use to construct a [daily Confluence activity email](https://www.midori-global.com/blog/2023/05/24/confluence-notification-and-reminder-to-page-owners?utm_campaign=gh&utm_medium=cac-comment-2396943&utm_source=cac) that covers or comes close to your requirements.

It can be even [more useful than the built-in Daily Digest](https://www.midori-global.com/blog/2024/01/24/confluence-daily-digest-email?utm_campaign=gh&utm_medium=cac-comment-2396943&utm_source=cac), as you can set up the notification to include pages from many or all spaces not just the pages you watch.

The contents of the email can be customized and the pages included can be precisely defined using CQL.

What's more, it includes page status changes as well:

![notification-email-page-status-changes-cloud.png](https://community.atlassian.com/t5/image/serverpage/image-id/326670i8109AB989FC046D8/image-size/large?v=v2&px=999 "notification-email-page-status-changes-cloud.png")

*(Please note that I'm part of the team developing Better Content Archiving for Confluence.)*


author: Linh Pham_Ricksoft_Inc
body: Hi [@Praveen P](/t5/user/viewprofilepage/user-id/5178756)

You could try adding the [contributors summary macro](https://support.atlassian.com/confluence-cloud/docs/insert-the-contributors-summary-macro/) to a Confluence page, also the [contributors macro.](https://support.atlassian.com/confluence-cloud/docs/insert-the-contributors-macro/) These are helpful to track the activities across your site, grouped by pages or authors.

Then, you could have your team watch or star the page and all updates will be sent through your daily digest: <https://community.atlassian.com/t5/Confluence-articles/Introducing-the-Confluence-Daily-Digest/ba-p/2042487>

![Screenshot 2023-07-17 at 22.18.29.png](https://community.atlassian.com/t5/image/serverpage/image-id/269341i09059C69A03B14FE/image-size/large?v=v2&px=999 "Screenshot 2023-07-17 at 22.18.29.png")

I hope this helps! :)


Tags: cloud

confluence-cloud
Unable to download attachments via Api from instance behind Identity Access Management solution
Asked by vijayendra:

Hey all,

I have data centre behind an \`Identity Access Management provider\`. I'm trying to download an attachment using a confluence link.  

https://{*domain-name* }/download/attachments/{*Page-id* }/{*attachment-name.png* }  

The curl request:   
curl --location --request GET  
'https://{*domain-name* }/download/attachments/{*Page-id}* /{*attachment-name.png* }' \\  
--header 'Authorization: Bearer *TOKEN* ' \\  

When I try to open the downloaded attachment, it redirects me to the \`Identity Access Management\` page showing error \`There was an unexpected internal error\`.  

I have allowed the IPs in \`Identity Access Management provider\` and I am able to successfully retrieve the page content with the API but downloading the attachments are failing.


Answers:
author: Brant Schroeder
body: [@vijayendra](/t5/user/viewprofilepage/user-id/5250489) welcome to the Atlassian community

What happens if you login first using the identity access management is a browser then go to the link, are you able to download it? Also what are you seeing in the logs?


Tags: confluence-server

server
How to filter inline comments in confluence cloud
Asked by Abhishek Ramakrishna P:

Hello,

I am trying to filter all inline comments which has been added to a page where I was tagged along with others. Is there a way I can filter all the inline comments including resolved and pending items.

Partially I do see there is an option to filter all the resolved inline comments but cannot filter the one's which I have closed or still pending to resolve.

Thanks!


Answers:
author: Brant Schroeder
body: [@Abhishek Ramakrishna P](/t5/user/viewprofilepage/user-id/4911374) there currently is very limited options to do what you are trying to do. You can vote for feature requests here that try to address the current limitations that you are experiencing.

* <https://jira.atlassian.com/browse/CONFCLOUD-37014>
* <https://jira.atlassian.com/browse/CONFCLOUD-34510>

comments: author: Abhishek Ramakrishna P
body: Thank you Brant, Would vote for the feature.


author: Brant Schroeder
body: [@Abhishek Ramakrishna P](/t5/user/viewprofilepage/user-id/4911374) Can you mark this as accepted to help others?


Tags: cloud

confluence-cloud
Why can't I configure the page blueprint
Asked by Tim Sigl:

Hi, I created a page blueprint in my personal space and now I can't click the button to configure it. Can you tell me why?![Page blueprint.JPG](/t5/image/serverpage/image-id/264420i0D2E1A5875E4A952/image-size/large?v=v2&px=999 "Page blueprint.JPG")


Answers:
author: Fabio Racobaldo _Herzum_
body: Hi [@Tim Sigl](/t5/user/viewprofilepage/user-id/5034247) ,

are you sure that blueprint has not been defined as global one? In that case, you should be able to edit it in General Configuration -\> Global Templates and Blueprints

Hope this helps,

Fabio


Tags: confluence-server

server
How to Export Zephyr scale data to confluence using webhooks
Asked by Prerak Mehta:

We want to export all the zephyr scale data for example, Traceability report to confluence page, then how do we do it? Can it be done using webhooks if yes then how exactly?


Answers:
author: Andy Barbet
body: Most reports in Zephyr Scale have an export dataset option located in the top right-hand corner. That will get you access to the raw data. You could also try asking SmartBear support for help here: [SmartBear Support](https://smartbear.atlassian.net/servicedesk/customer/portal/42/user/login?destination=portal%2F42)

comments: author: Prerak Mehta
body: Thank you so much Andy. I'll take a look at it,


author: Andy Barbet
body: You're welcome. The Zephyr Scale community forum is located here and you might find that more useful for support specific to that plug-in: [Zephyr Scale Community](https://community.smartbear.com/t5/Zephyr-Scale-Questions/bd-p/ZephyrScale)


author: Prerak Mehta
body: Any idea whether this could be done by webhooks or Zephyr scale API access token?


author: Andy Barbet
body: I'll reply in the zephyr scale community form


author: Prerak Mehta
body: Hey Andy, I posted the same question in Zephyr scale community forum. Plz help me out.

[How to Export Zephyr scale data to confluence - SmartBear Community](https://community.smartbear.com/t5/Zephyr-Scale-Questions/How-to-Export-Zephyr-scale-data-to-confluence/m-p/252329/highlight/true#M2683)


author: Andy Barbet
body: Hey Prerak,

I posted a reply on the forum. I wish I could help, but I'm not versed in the tech you're speaking about. The little work I've done in the Zephyr Scale API leads me to think that it may not be possible to do what you want using the API, unless of course you mean to use the API to access the raw data and then build the report yourself, but again I have no experience at trying to do that. I'm also not aware of any webhooks that are available for use. It's why I suggested going down the route of contacting SmartBear support: they are usually quick to reply and you'll get an accurate answer.

If you do find the answer I'd really like to hear what they say or what you find out.

Best of luck.

Andy


Tags: cloud

confluence-cloud

export

webhook

zephyr
Beta - Guest Accounts on Confluence Contribute to Total Number Allowed?
Asked by Fi Gordon:

Hi folks,  
Recently we've seen that guest account access has been added to confluence in beta. Can someone please help me understand what is the point if they count towards the total paid number of users?

Thanks


Answers:
author: Andy Gladstone
body: [@Fi Gordon](/t5/user/viewprofilepage/user-id/4982812) you should read this post about the Guest feature coming out of beta and into GA.

<https://community.atlassian.com/t5/Confluence-articles/Collaborate-with-anyone-anywhere-with-Confluence-guests-GA/ba-p/2396148>

You should note that billing will only be applied to guests with managed accounts. Basically this means you can invite anyone as a guest OUTSIDE of your domain, but if your domain is managed you won't be able to invite **free** guests that come from the same domain. So in essence, you cannot cut your bill by inviting actual employees as guests. But again, this is only if you have a managed domain.


author: Fi Gordon
body: Thanks [@Andy Gladstone](/t5/user/viewprofilepage/user-id/3498028) :)


Tags: cloud

confluence-cloud
Confluence page - Lost images on time out on MS Edge browser
Asked by Andreina.Godoy:

Hi,

My Confluence session timed out before I saved and now images are not showing, just the links, I can see them in Google Chrome though, so they are still in the page. Added another image in Chrome, went back to Edge, but the old images are still not showing on Edge, only the newly added one. The disappearing images were saved yesterday so they were there when I edited the page today. How can I make those images to show in Edge browser?

Thanks,


Answers:
author: Brant Schroeder
body: [@Andreina.Godoy](/t5/user/viewprofilepage/user-id/5250145) Welcome to the Atlassian community

I would suggest clearing your cache if they are showing up in other browsers.

comments: author: Brant Schroeder
body: [@Andreina.Godoy](/t5/user/viewprofilepage/user-id/5250145) did this fix your issue? If yes can you accept it to help others?


Tags: confluence-server

server
Set up this design (USB Device for PL Data Acquisition on Zynq UltraScale+ MPSoC)
Asked by farshideh kordi:

Hi, I need your help to set up USB3 for pl side, I set up all parts based on this page

<https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/968785932/USB+Device+for+PL+Data+Acquisition+on+Zynq+UltraScale+MPSoC>

Now, I want to know when I apply these changes on usb_intr_example.c and build the code in vitis what do I need to do for test it ? Do I need to use petalinux for test this design?


Answers:
author: Mikael Sandberg
body: Hi [@farshideh kordi](/t5/user/viewprofilepage/user-id/5250045),

Welcome to Atlassian Community!

Your question is better suited for [Xilinx Community Forums](https://forums.xilinx.com/), my bet is that you ended up on the Atlassian Community because you clicked help and then Ask the community in Confluence.


Tags: cloud

confluence-cloud

mistaken-post