youngmon/atlassian-qna huggingface dataset:
External diff tool cmd shows \r\n and does not launch
Asked by taalmala:

For some strange reason, the external diff in Sourcetree stopped working after recent upgrade (I want to use Beyond Compare). Here is the process viewer log:

```
[
{
"Command": "git\r\n-c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks -c credential.helper= -c credential.helper=\"C:/Users/<username>/AppData/Local/ATLASS~1/SOURCE~1/GIT_EX~1/GIT-CR~1.EXE\" difftool -y --tool=sourcetree --\r\nfilename.xml",
"Directory": "C:\\Users\\<Username>\\Project",
"Status": "Finished",
"Duration": "00:00:01.1855150",
"CallerContext": "GetExternalDiffProcess",
"Output": "Unknown merge tool sourcetree\nfatal: external diff died, stopping at <ProjectDir>/filename.xml\n"
}
]
```

As you can see, the git command contains "\\r\\n" in the command line. The git command with this "\\r\\n" does not work even in the terminal. If I remove "\\r\\n" from the command line and paste the command in terminal, it works fine. I am suspecting this "\\r\\n" to be a source of the problem, but I have no idea where it's coming from.

At the end, the log shows an error message about merge tool. I don't understand what that means. Here is my .gitconfig file.

```
[core]
autocrlf = true
[user]
name = My name
email = myemail@email.com
[diff]
tool = bc3
[difftool "bc3"]
path = "c:\\Program Files (x86)\\Beyond Compare 3\\Bcompare.exe"
trustExitCode = true
```

I am using Windows 10, 1809.

Can someone help?


Answers:
author: taalmala
body: The solution posted [here](https://community.atlassian.com/t5/Sourcetree-questions/Sourcetree-Won-t-Launch-External-Diff/qaq-p/1136586) helped me.
Sourcetree.app: external Diff isn't working on MacOS 10.14 Mojave
Asked by kolimarfey:

After clean installation of MacOS 10.14 Mojave and Sourcetree external diff isn't working.

After some investigation it isn't working because of security settings - for some reason Sourcetree isn't asking for additional permissions to control other apps. I've checked on old computer which was updated from previous versions of MacOS and I see that there is entry for Sourcetree in Settings \> Security \& Privacy \> Automation. While on new installation of MacOS Mojave new record isn't adding.

New MacOS Mojave installation:

![Screen Shot 2019-11-28 at 16.58.58.png](https://community.atlassian.com/t5/image/serverpage/image-id/74343iD27B6EDF063085B7/image-size/large?v=v2&px=999 "Screen Shot 2019-11-28 at 16.58.58.png")

Old MacOS which was upgraded from previous versions:

![Screen Shot 2019-11-28 at 5.04.55 pm.png](https://community.atlassian.com/t5/image/serverpage/image-id/74346i6D2FDCE84AA2256A/image-size/large?v=v2&px=999 "Screen Shot 2019-11-28 at 5.04.55 pm.png")

And I don't see way on how to add Sourcetree there, it looks like Sourcetree should ask for this permission. Is there any solution for this?


Answers:
author: name-flatmap
body: Happens the same to me. Remove current version and downgrade to [3.2.1](https://product-downloads.atlassian.com/software/sourcetree/ga/Sourcetree_3.2.1_225.zip?_ga=2.231214303.1784277551.1579286228-1732880419.1579286228) . This release should ask for permission.


author: kolimarfey
body: up


Tags: automation

diff

mac
?????????????????????????
Asked by fujita-masayuki:

?Git ????????????????????????????????????????????????????????????????????????

????????????????????????????????????

??????????????


Answers:
author: Nobuyuki Mukai
body: ????????????????

<https://community.atlassian.com/t5/Sourcetree-questions/Bitbucket-%E3%81%BE%E3%81%9F%E3%81%AF-Sourcetree-%E3%81%A7%E7%89%B9%E5%AE%9A%E3%81%AE%E3%83%95%E3%82%A1%E3%82%A4%E3%83%AB%E3%81%AE%E5%B1%A5%E6%AD%B4%E3%82%92%E5%85%A8%E3%81%A6%E3%83%80%E3%82%A6%E3%83%B3%E3%83%AD%E3%83%BC%E3%83%89%E3%81%99%E3%82%8B%E6%96%B9%E6%B3%95/qaq-p/1231008>

???????????????? ??????? **test.txt** ????????? **test.txt.\<?????\>** ?????????????????????????????????????????????????????????????????????????????

1. *git log* ????????????????????? ?????????????????????????????Shell???????

    git log test.txt | grep 'commit ' | awk '{print "git checkout " $2 " && cp test.txt ../test.txt." $2 }'

???????

2. ??????????????????????????????????????????????

    git checkout <?????1> && cp test.txt ../test.txt.<?????1>git checkout <?????2> && cp test.txt ../test.txt.<?????2>
    ....

????????????????????????????????

comments: author: fujita-masayuki
body: ?????????? ???

????????????????

?????????????????????????????"test.bat"???????????????????????????????????1????????????

?????????????????????????SourceTree?????????????????????????????

???????????????

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


author: Nobuyuki Mukai
body: ???????awk?????????????????????????????

template1.c???????????????????????????????????????????

```
git log template1.c | grep 'commit ' | awk '{print "git checkout " $2 " template1.c && cp template1.c ../template1.c." $2 "\n"}'
```

??????SourceTree??????Git????????????????????????????????????????????????


author: fujita-masayuki
body: ?????????? ???

?"\\n"?? LFLF ?????????????????? "\\r" ?????? CRLF ???????????test.bat???????????????

$ git log template1.c \| grep 'commit ' \| awk '{print "git checkout " $2 " template1.c \&\& cp template1.c ../template1.c." $2 "\\r"}' \> test.bat

??????????SourceTree ????????????LF ???????????????????????????

$ git log template1.c \| grep 'commit ' \| awk '{print "git checkout " $2 " template1.c \&\& cp template1.c ../template1.c." $2 }' \> test.sh

$ ./test.sh

??????????????????


author: Nobuyuki Mukai
body: ?????????????????????????????????

??????????????????????????????????????????


Tags: language-ja
How could I get the 3.3.4 version
Asked by Cuthbert Tse:

I am currently using 3.2.6 which crashes during commuting. After that I re-install and fix the issue. I asked the engineer in my team and he said I should update to 3.3.4, which is what others are using. But I do not know how to get that version. Default download leads me to 3.2.6 again and pressing update in options changes nothing.

Is there anyway I can get the 3.3.4?


Answers:
author: rougou
body: I'd steer clear of 3.3.4. It has several issues such as terminal and custom actions being broken. This was confirmed via the update. I tried to download the stand-alone to see if things would be different, but my security software found it to be ransomware.

I'm afraid to even try 3.3.6.

[https://community.atlassian.com/t5/Sourcetree-questions/Custom-actions-no-longer-working/qaq-p/1219284?utm_source=atlcomm\&utm_medium=email\&utm_campaign=kudos_question\&utm_content=topic](https://community.atlassian.com/t5/Sourcetree-questions/Custom-actions-no-longer-working/qaq-p/1219284?utm_source=atlcomm&utm_medium=email&utm_campaign=kudos_question&utm_content=topic)


author: Daniel Eads
body: Hey [@Cuthbert Tse](/t5/user/viewprofilepage/user-id/3653474) , welcome to the Community!

We use a phased-rollout approach to new versions of Sourcetree that helps reduce less users to potential new bugs (which we are able to then fix before releasing more widely). This means that most people will still get 3.2.6 at the moment when clicking the download button from the Sourcetree website.

You can jump the line and get the [very most recent release here](https://product-downloads.atlassian.com/software/sourcetree/windows/ga/SourceTreeSetup-3.3.6.exe) (3.3.6) or if you'd like to match versions with your teammates, [grab 3.3.4 from here](https://product-downloads.atlassian.com/software/sourcetree/windows/ga/SourceTreeSetup-3.3.4.exe).

Cheers,  
Daniel


Tags: update
How to clean list of "Moved or Deleted" Local repositories?
Asked by Dave Ludwig:

Is there any way to clean up the list of Local repositories all at once? I must have 50 "moved or deleted" entries. And cleaning them up one by one is no joy.

Also I can't see why I have this many. I admittedly delete repos occassionally, and once I moved my root folder, but still it seems like if I delete a repo, then clone it to the same place, it creates a new entry here.

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


Answers:
author: BertjeBertje
body: I also would like to have an option to just **empty**the list.

There is a right-click option to 'delete' an entry. But that has a very scary description and is probably not what I want!

"Are you sure you want to remove the following nodes and all of their children?"

Besides that, when I open a repository through the File/Open dialogue, it **does not appear** in the list! So I am struck with old entries I don't even dare to touch.
Integration sourcetree with lemontree
Asked by Andrea Paietta:

Good morning,

I need to compare 2 Enterprise Architect model. For doing this locally I used lemontree. The tool company declares that it is possible to compare 2 models of different GIT commitee. Anyone knows if it possible to configure sourcetree to do that.

Thank you in advance,

Andrea Paietta


Answers:
author: Stefan Baar
body: Hi Andrea

Check out the LemonTree Helppage "SourceTree Integration"! <https://help.lieberlieber.com/pages/viewpage.action?pageId=53379126>

That should do the trick.

Regards

Stefan


author: Ana Retamal
body: Hi Andrea, welcome to the Community!

Sourcetree allows the use of external diff / merge tools, but Sourcetree is not in the list:

![Screenshot 2019-11-25 at 10.23.15.png](https://community.atlassian.com/t5/image/serverpage/image-id/73924i1F59BA02B1C41B0B/image-dimensions/255x339?v=v2 "Screenshot 2019-11-25 at 10.23.15.png")

Would it be an option for you to use a different one or using a custom command?

Cheers,

Ana

comments: author: Andrea Paietta
body: Hi Ana,

Thank you for the answer. If you have some advises about use custom command, in order to use LemonTree, for me it is ok.

Thank you in advance,

Andrea
Last 10 days of work is lost after git push --force
Asked by kokhow.teh:

I tried to add pattern to GIT LFS today and all the work in the last 10 days are gone!!! The last commit seen is 11th Nov. All the work in between are all gone!!!

Last week I added \*.html to GIT LFS. Today I tried to add \*.{html, svg} and this is what I get!

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

$ g reflog show --all  
a7406c404 (HEAD -\> UpgradeDotNetCore, origin/UpgradeDotNetCore) refs/remotes/origin/UpgradeDotNetCore@{0}: update by push  
a7406c404 (HEAD -\> UpgradeDotNetCore, origin/UpgradeDotNetCore) refs/heads/UpgradeDotNetCore@{0}: commit: Fix GIT  
a7406c404 (HEAD -\> UpgradeDotNetCore, origin/UpgradeDotNetCore) HEAD@{0}: commit: Fix GIT  
1eaf71063 refs/remotes/origin/UpgradeDotNetCore@{1}: update by push  
1eaf71063 refs/heads/UpgradeDotNetCore@{1}: commit: Track wwwroot  
1eaf71063 HEAD@{1}: commit: Track wwwroot  
207186a6c refs/heads/UpgradeDotNetCore@{2}: branch: Created from refs/remotes/origin/UpgradeDotNetCore  
207186a6c HEAD@{2}: checkout: moving from dev to UpgradeDotNetCore  
be3b63495 (origin/dev, origin/HEAD, dev) refs/heads/dev@{0}: clone: from https://kokhow@bitbucket.org/4xlabs/bz-frontend.git  
be3b63495 (origin/dev, origin/HEAD, dev) refs/remotes/origin/HEAD@{0}: clone: from https://kokhow@bitbucket.org/4xlabs/bz-frontend.git  
be3b63495 (origin/dev, origin/HEAD, dev) HEAD@{3}: clone: from https://kokhow@bitbucket.org/4xlabs/bz-frontend.git

Any advice and insight is appreciated.


Answers:
author: Ana Retamal
body: Hi [@kokhow.teh](/t5/user/viewprofilepage/user-id/3438248) ,

Thanks for reaching out!

This is not an issue with Sourcetree or Bitbucket, this is how Git works. The good thing about Git is that it is a version control system, so your work is not lost, you just need to go back to a previous version before you did the force push and you'll be able to continue working from that point on.

You can learn different ways of undoing changes in one of [our tutorials](https://www.atlassian.com/git/tutorials/undoing-changes). You can also refer to the official [Git documentation](https://git-scm.com/doc) for further explanation.

Hope that helps,

Ana


Tags: bitbucket

git-lfs
I can't open iTerm with sourceTree
Asked by GreatPeng:

mac: 10.15.1 Catalina

SourceTree: 4.0(232)

I used to click 'open iTerm' button and it worked always. But it didn't work yesterday. I can open Finder, but not iTerm. I don't know why.

First I kill iTerm, then click 'open iTerm' button, my iterm opened, but not my path, it's '\~/'.

Maybe I set something wrong, anybody know it?


Answers:
author: GreatPeng
body: Download sourcetree(other version like 3.2.1), and open it.

Allow permissions.

Then upgrade to 4.0

comments: author: Rod Recio
body: Thank you. It worked for me!


author: DanielJLewis
body: This worked for me, too! Thank you!

I tried updating to 4.0.1 and also compared my macOS Security \& Privacy settings before and after [@GreatPeng](/t5/user/viewprofilepage/user-id/3616219)'s tip, but I couldn't find any difference. So this weird workaround seems the only way to make it work until Sourcetree is fixed.


author: Charlie McGeorge
body: This worked for me also, thank you!

For those coming from Google: the download link for 3.2.1 can be found [here](https://www.sourcetreeapp.com/download-archives).


author: cthompson
body: I don't see an 'Open iTerm' button in either version... where is that?

Just 'Terminal' which is the less nice Mac native terminal.

comments: author: cthompson
body: I have iTerm2 set as my default terminal but, Sourcetree does not use it. Would be nice feature if we could pick! ;)
I cannot install Sourcetree. "Apple cannot check app for harmful software"
Asked by Alexander Filippov:

I uninstalled previous version of Sourcetree, as I got the problem with identification\> When cloning a remote repo, I did a mistake in login. And Sourcetree was asking me a password for wrong login.  
Then I downloaded app from the site and tried to install it.  
get the following from my Mac:  
![?????? ?????? 2019-11-22 ? 14.02.32.png](https://community.atlassian.com/t5/image/serverpage/image-id/73785iAE17DC004E780371/image-size/large?v=v2&px=999 "?????? ?????? 2019-11-22 ? 14.02.32.png")please help


Answers:
author: codemic-pl
body: [@Alexander Filippov](/t5/user/viewprofilepage/user-id/3648059)

1. Run sourcetree  
2. Dismiss error message  
3. Go to system preferences -\> Security \& privacy  
4. At the general tab, you should have message about blocked sourcetree, click "open it anyway"

Sourcetree should start.

comments: author: Alexander Filippov
body: thx a lot. it helped


author: Alexander Filippov
body: the translation of the message:  
It is not possible to open Sourcetree file, as Apple cannot check it for harmful software.  
Software needs update. Contact the developer for detailed information


author: Malissa_Atkins
body: I am also getting this error and do not feel like I should have to bypass the security issue from my OS. I need to run this software for my college course and really need help to figure out what is going on.

macOS Catalina version 10.15.5


author: Edward_Rykiel
body: Atlassian should fix the problem instead of compromising macos with a security issue.

comments: author: Stefan ?berg
body: Is there any answer to "fix the problem" on this issue?


Tags: mac
Confluence Cloud: Images disappear as soon as link is added
Asked by Steffen Willsch?tz:

Hey there,

my issue: I create a table and add images (PNG). Save changes, all fine. Now, as soon as I add a link to the images to another Confluence page, some of the linked images (not all) disappear as soon as I update the page.

I tried t work around this with a new table, a new page and a new page in a different space. Nothing works. Except: it's not always the same images that disappear, it seems random instead.

Help appreciated. Thanks in advance,  
Steffen

**UPDATE**

This also happens with SVG and JPG. And - now it's getting awesome - also with linked text. Related images are still available in attachment section.


Answers:
author: Sebastian Krzewi?ski
body: Hi [@Steffen Willsch?tz](/t5/user/viewprofilepage/user-id/5477845)

Unfortunately I don't have idea what can be a cause. I didn't have this issue.

Did you ask Atlassian Support (<https://support.atlassian.com>)? They will have access to your instance logs and they have more options to check this.

Regards.

Seba


Tags: cloud

confluence-cloud

image
??confluence??????????????server.xml????????????
Asked by lijintao:

![????_20240417135218.jpg](/t5/image/serverpage/image-id/318767iC523E0B39BD0BEB0/image-size/large?v=v2&px=999 "????_20240417135218.jpg")![????_20240417135203.jpg](/t5/image/serverpage/image-id/318768i0104DEDC5D95B3D7/image-size/large?v=v2&px=999 "????_20240417135203.jpg")


Answers:
author: Fabio Racobaldo _Herzum_
body: Hi [@lijintao](/t5/user/viewprofilepage/user-id/5477755) and welcome,

try to check the logs file (atlassian-confluence.log) on the Confluence home folder and provide us more information. In addition, please share the connector configuration on the Confluence-Inst folder /conf/server.xml

Fabio


Tags: ??-????

??-??????

????

??????
Unable to create smart link for parent along with child pages
Asked by Rohith k:

Hi Team,

We are unable to smart link child pages were, we are trying to create smart link for parent page and only parent page smart link is getting created. we need to create smart link parent as well as child pages instead of manually smart linking each child pages.

Is there any way to create parent page smart link along with child pages.

Thanks,  
Rohith


Answers:
author: Linh Pham_Ricksoft_Inc
body: Hi [@Rohith k](/t5/user/viewprofilepage/user-id/5305853)

[Smart links](https://support.atlassian.com/confluence-cloud/docs/insert-links-and-anchors/) is essentially dynamic way to display content from an external source, can you clarify what you meant by " create smart link parent as well as child pages instead of manually smart linking each child pages"

Did you mean to visualize a page tree (parent and child pages) on a Confluence page?

comments: author: Rohith k
body: Hi [@Linh Pham_Ricksoft_Inc](/t5/user/viewprofilepage/user-id/5233021)

We are trying to smart link a page which has child pages to display in another space. We need the parent and child tree smart links to be displayed on another space.  

Attaching screenshots for reference.  

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

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


author: Linh Pham_Ricksoft_Inc
body: [@Rohith k](/t5/user/viewprofilepage/user-id/5305853)

Ah I understand your use case, thank you for the additional info!

The Smart link won't populate the children pages on the page tree - it only renders content from the "Client Contacts" page.

As a workaround, I'd suggest using the [Page Tree macro](https://support.atlassian.com/confluence-cloud/docs/insert-the-page-tree-macro/) instead. On the DevOps space, you can create the "Client Contacts" page and then add the Page Tree macro, define the root (parent page) from the "Client Contact Information" space. You'll see the children pages embedded on the page.

Here's a sample setup I have:
> Display page tree from Mobile Development space on Engineering support page:

![Monosnap Edit - Pages from MOBL - Engineering Support - Confluence 2024-04-17 17-01-03.png](https://community.atlassian.com/t5/image/serverpage/image-id/318834i3615ADB08BDF01D4/image-size/large?v=v2&px=999 "Monosnap Edit - Pages from MOBL - Engineering Support - Confluence 2024-04-17 17-01-03.png")

I hope this works for you!


Tags: cloud

confluence-cloud
How to bring all Scrum Team Velocity Chart in One Confluence Page
Asked by Magesh Shanmugam:

I want to show Velocity chart in Jira of 5 different scrum teams in one single Confluence page; velocity chart of one team followed by other teams. This is not to compare between teams but to show leadership one single view of 5 different teams.

How to bring this in Confluence page by using the link of Velocity chart in Jira (Report -\> Velocity chart page)


Answers:
author: Danut M _StonikByte_
body: Hi [@Magesh Shanmugam](/t5/user/viewprofilepage/user-id/5477720),

Confluence and Jira does not offer a Velocity gadget/macro.

Your best option here is our [Great Gadgets](https://marketplace.atlassian.com/apps/1226592/great-gadgets-for-confluence-agile-charts-custom-reports?hosting=cloud&tab=overview) app, which offers a **Team velocity macro** that will fully address your needs.

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

It is highly configurable and offers additional metrics comparing with the Jira's report, like sprint scope changes, for example.

See more examples of this gadget/macro (and the many others offered by the same app) in these articles:

* <https://community.atlassian.com/t5/App-Central/8-gadgets-for-a-powerful-Scrum-dashboard-in-Jira/ba-p/1683063>
* <https://community.atlassian.com/t5/App-Central/How-to-track-scaled-agile-SAFe-projects-in-Jira-with-Great/ba-p/1929694>

You could start with a 1-month of free trial. If you have any questions, please don't hesitate to contact us at support@stonikbyte.com.

Hope this helps.

Danut


Tags: cloud

confluence-cloud