youngmon/atlassian-qna huggingface dataset:
Will SourceTree be updated to add Kaleidoscope merge support?
Asked by etrep:

Currently, SourceTree supports Kaleiodoscope as a built-in diff visualisation tool, but not as a merge tool.

However, the just released Kaleidoscope 2.0 (which has been available as a public beta for several weeks) now has built-in three-way merge support.


Answers:
author: KieranA
body: Hey Eric,

SourceTree 1.5.7 supports Kaleidoscope 2 as a merge tool. This has been released to the public for direct downloaders and is currently in the App Store awaiting approval, so if you're an App Store user there'll be some delay until Apple approve it.

Hope that helps

comments: author: etrep
body: Awesome! Thanks for the quick feedback. I do use the MAS version, so I'll wait.


Tags: merge
Sourcetree: how do I view and copy the entire commit comment from the Description column?
Asked by Richard Grossman:

Sourcetree: how do I view and copy the entire commit comment from the Description column?

A) I can't see all of the comment because if it is a multi-line comment, I can't expand the window wide enough to see everything.

B) I want to copy another user's branch commit comment so I can use it in an email.

FYI, we're using Sourcetree with hosted GIT (Assembla).


Answers:
author: rverschoor
body: Instead of copying the commit comment from the Description column, you can copy the comment from the commit detail window :

![](../../upfiles/00000176.png)

comments: author: Richard Grossman
body: Wow - I had the commit detail window set so short that I never saw the commit comment there.

Thanks.


author: simplysanthakumar
body: I can't able to view commit details window. How to view in Mac Source Tree. Please help


author: Chris Nordberg
body: I am also having this issue on my Mac, SourceTree v2.3.1. In the log view I can see the list of affected files but there is no commit detail (the section is entirely missing). On another Mac running the same SourceTree version I can see both the files and the commit detail. I have no idea how to get the commit detail back.


author: Tomas Hanus
body: I have the same issue. 2.2.2 (51), after upgrade it is the same ![sad](/html/@C495B4504065515364EB1894F812B34C/images/emoticons/sad.png "sad")


author: Tomas Hanus
body: see\> <https://answers.atlassian.com/questions/15282793>
Multiple working trees?
Asked by David Bainbridge:

Is it possible to have two separate branches of the same repository open at the same time? I'd like to have an Xcode project open from one branch and the same Xcode project open but from another branch at the same time. So it would seem to me I would need two bookmarks specified. Both would point to the same repository but would allow me to work on two different branches of the same repository at the same time. Is this correct?


Answers:
author: KieranA
body: Hey dkb,

We actually do this ourselves here to save switching branches. The way to do it is checkout multiple copies of your project, but each folder in your file system having different branches checked out. So essentially the same repository checked out multiple times to different locations. You can name the bookmark whatever you want which will give it the folder name to reflect the bookmark name allowing you to tell the difference. So for SourceTree we could give it names such as SourceTree_1_4 to indicate version 1.4. In Xcode you can quickly find out what version you're on (because it will just tell you your project name) by cmd + clicking on the very top middle where the project name is, and it will tell you the location of your project.

Hope that helps

comments: author: David Bainbridge
body: Thanks. That answers my question perfectly. I wonder if there isn't a new feature lurking here. This concept could be better integrated into SourceTree. The ability for SourceTree to handle creation and switching between "independent" working trees.


author: KieranA
body: The bookmarks reflect paths. I can see where you're going for hot-swapping between branches, but usually if you're doing that you need to do an update anyway as there's typically changes in other branches. Plus, the line between updating to a branch and switching between different directories becomes very blurred and can make it more confusing for the user. SourceTree reflects what Git/Mercurial does, and if we did what you suggested then it wouldn't be reflecting that functionality. Good idea otherwise though, it's just Git/Mercurial isn't designed to do this kind of thing :)


author: David Blickstein
body: Git now provides a MUCH better way to do this and I would LOVE to see SourceTree support it.  

Right now, I haven't the foggiest I deal what SourceTree is going to "see" if I create a second working tree. I'd like to think it's exactly what I'd see today if there wasn't a second working tree. That would be safe - but it would mean that I couldn't use SourceTree in the second working tree.  

<https://stacktoheap.com/blog/2016/01/19/using-multiple-worktrees-with-git/>
Why is "import as full commit" disabled?
Asked by christoph_dietze:

Hello!

I made a commit and created a patch out of that. Then I reset my master before that commit.

Now, in the drop down box in: Actions -\> Apply Patch... , I select the patch file just created, but the item "import as full commit" is greyed out. I cannot see the reason why it is disabled?


Answers:
author: KieranA
body: Hi Christoph,

This would indicate to me that the patch either isn't made from a commit or there's something wrong with the patch file itself. In Mercurial we expect to see "# HG changeset patch" at the start of the file and in Git we expect to see "From: " and "Subject: " as is usually in a patch file made from a commit (more docs on Git patches here: <http://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html>). It can only be a full commit if it was a patch created from a commit, hence the reliance on what should be in the patch file.

You may have accidentally created the patch from uncommitted changes meaning there was no author and thus not allowing you to import it as a full commit. If you check the patch file contents itself to see if they match the format as was briefly described in the above paragraph then we can see from there what's going wrong in this case.

Hope that helps

Cheers
\<body\>\</body\>

comments: author: christoph_dietze
body: I am using GIT by the way :-)

I created the patch from a commit that I haven't pushed yet.

I checked the patch file and it starts with:

```
From 9a247ca8a521b066adb43e9c9369223781816f99 Mon Sep 17 00:00:00 2001From: Christoph &lt;christoph.dietze@gmail.com&gt;Date: Fri, 11 Jan 2013 11:12:50 +0100Subject: ....
```


author: stevestreeting
body: The git patch analysis actually looks for 'From:' in the first line, when in fact yours starts with 'From ' (no colon). Looks like git format-patch's output must have changed without us noticing.

Filed as a bug here: <https://jira.atlassian.com/browse/SRCTREE-1376>


author: christoph_dietze
body: Using git directly on the commandline works:

```
git am ../patch.diff Applying: My generous patch
```

But in SourceTree I cannot apply the commit from that same file.
Is the Log View uncommitted line mode gone / changed in sourcetree somehow (v 1.5.6)
Asked by DanielDornhardt:

Hello,

yesterday at my colleagues computer I first noticed this phenomenon, and now I see the same thing in my Sourcetree (Using Mercurial as VCS):

Before this, if I had any changes to the currently active revision, sourcetree showed a grey line above the others in the log view (Log View uncommitted line feature) which I could choose and then see which changes Mercurial was picking up.

This doesn't seem to happen anymore. I can see the changes in the File Status view but no longer on the log view, which is a shame, because I was able to have an overview over almost everything on one screen which I liked.

Also this is pretty irritating because at first it feels like I didn't do the changes I just made / did them in the wrong directory / Mercurial is not picking up my changes or what have you.

So, is this planned and wanted behaviour or a hiccup or has it something to do with my configuration (or my wetware)?

Thanks and best wishes, Sourcetree is an awesome tool, thanks a thousand times and all the best in the world to you.


Answers:
author: DanielDornhardt
body: Okay, it worked the same way as I described again for me now too...

It's not a refresh thing, I'm quite sure, I Pressed Cmd+R and used the menu to refresh as well in both instances.

But for now it seems to work, thank you, if I can see any other occurrence of this I'll add another comment here.

Thank you and best wishes


author: stevestreeting
body: This hasn't been removed in 1.5.6 or 1.5.7, in fact I just used it myself on a hg repo only yesterday!

More details about the setup might help, and perhaps it's an auto-refresh thing, you could try hitting Cmd-R in the log view to force a refresh un case it's that.
How to run a JavaScript code in IFTTT
Asked by martin alejandro garcia rodriguez:

Hello, I have a Javascript that is working well to create a random number, but I want to integrate this code to my template , I understand that I can use IFTTT to integrate this code to my template but I don?t how to do it.

This is the code :

\<!DOCTYPE html\>  
\<html\>  
\<body\>

\<h1\>JavaScript Math\</h1\>  
\<h2\>The Math.random() Method\</h2\>  
\<p\>Math.random()\*100 returns a random number between 0 and 100:\</p\>

\<p id="Folio"\>\</p\>

<br />

\<script\>  
let x = Math.floor((Math.random() \* 10000) + 1);  
document.getElementById("Folio").innerHTML = x;  
\</script\>

<br />

\</body\>  
\</html\>

Need help.

Thanks

Martin


Answers:
author: Andy Gladstone
body: [@martin alejandro garcia rodriguez](/t5/user/viewprofilepage/user-id/4496406) what does this have to do with Confluence or Atlassian's App Questions for Confluence? Are you sure you are posting in the correct forum?

comments: author: martin alejandro garcia rodriguez
body: Andy Gladstone, certeinly I am not an expert in Confluence and I not JavaScript expert, but in the Confiform IFTTT there is a list of actions , on of them say RUN JAVASCRIPT, that is the reason why I am writting in this forum, in order to get help to understand why if I comply with the parameters describe in the configuration of IFTTT my template does not work,, I think this forum was created this for. And my case is related about Confiforms.

Martin


author: Andy Gladstone
body: [@martin alejandro garcia rodriguez](/t5/user/viewprofilepage/user-id/4496406) moving your question to the Confluence Collection for more visibility and to place it in the right location.


Tags: questions-for-confluence

server
Gadget Jira Board
Asked by brittnee:

I currently have the Jira gadget on my overview page, however, I am part of several teams/boards. How do I select the specific Jira boards that I want to be listed on this Confluence Gadget Board, I do not want to see all the boards here, only my primary focus boards.


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

Try our [Great Gadgets](https://marketplace.atlassian.com/search?query=agile+great+gadgets+stonikbyte) app. One of the many gadgets/macros that it offers is the Team Wallboard gadget that allows you to display your Jira board in Confluence.

![](https://marketplace-cdn.atlassian.com/files/0e07e142-1bf2-48b0-8037-cafa1e9f0ef7?fileType=image&mode=full-fit)

It is highly configurable, you can adjust the colors, supports quick filters and swimlanes.

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

If you have questions, please don't hesitate to contact us as support@stonikbyte.com.

Thank you,

Danut Manda


author: Manoj Gangwar
body: You can use your board filter in the Jira gadget on Confluence then it will show you only your board issues.

comments: author: brittnee
body: That's what I was thinking, but can't find the filter


author: Manoj Gangwar
body: Open the Jira board\>\>Go to the board configuration \>\>Under General tab you can check the filter name and query both.


author: brittnee
body: Do I do this on the confluence gadget board or actually in Jira?


author: Manoj Gangwar
body: You can check the filter name in Jira and then go the Confluence overview page\> edit it and past the filter or JQL query under the Jira gadget.


Tags: cloud

confluence-cloud

jira
Clone a Confluence Space into a Different Organization
Asked by wbralick:

We are supporting the transition of support from one organization to another. All of the Atlassian data (Jira Software, Jira Service Management, and Confluence) is in the Atlassian cloud. There is 1 Jira project and its related Jira Service Management project and 1 Confluence space. We also have Zephyr Scale tests to be included.

We are planning to use Deep Clone for Jira to provide the external organization with a copy of a project and its service desk. We also need to provide a clone of the Confluence space referenced by the issues in Jira and its related service desk.

What is the best approach to migrating all of that from one organization to another while maintaining the originating Atlassian project/space?

Thanks!

Will


Answers:
author: Manoj Gangwar
body: For Confluence, XML space exports can be used to import your space content into another Confluence space running the same or newer version of Confluence.

comments: author: wbralick
body: Hi Manoj!

Thanks! When the receiving organization imports the space will the links to/from the Jira deep clone be carried into the new organization? If the new organization needs to re-link things that would be difficult, but not necessarily a show-stopper.

Thanks, again!

Will


Tags: cloud

confluence-cloud
Can I edit the fields when creating issues from inside Confluence?
Asked by maria.ribeiro:

I need to fill in the 'Category' field because it is mandatory for my board. However, when creating Jira issues from within Confluence, I can only provide information for the server, project, issue type, and description. It would be faster if I could also see the category field on the Confluence page, as it would help ensure that people don't miss the requirement to fill in the field.

How can I edit the fields shawn in Confluence in that modal?


Answers:
author: Manoj Gangwar
body: You may follow the below Atlassian doc.

<https://confluence.atlassian.com/confkb/how-to-make-a-field-visible-in-the-create-jira-issue-dialogue-in-confluence-678560701.html>


Tags: cloud

confluence-cloud

jira

jira-cloud
Smart Value help - Date + 1 Day?
Asked by Amy Chamberlain:

Hi All!  

Trying to schedule an automated page creation. Automation is set to create the page on Monday, but for a meeting on Tuesday (allows us time to collect agenda items.)  

The smart value auto-populated in the template says {{now.shortDate}}-- so two questions:  

1. What does this mean and how is it different than {{page.dateFirstPublished}}?  
2. How would I scripted something like \[date page is created + 1 date\]? Or is this even possible?

Thx Atlassian Nerds! From one nerd to another, sending much Atlove.


Answers:
author: Aron Gombas _Midori_
body: The Confluence Automation documentation is very short (they are probably working on that), but the basic are identical with Jira Automation, so you can always go there and try what you see there. Especially, because "date" values probably support the same operators in both products.

And in Jira, it is possible to do date aritmetic like this:

```
{{now.plusHours(1).shortTime}}
```

So it would likely work for you:
> {{now.plusDays(1).shortTime}}

See: <https://support.atlassian.com/cloud-automation/docs/jira-smart-values-date-and-time/>

comments: author: Amy Chamberlain
body: Wouldn't the latter be:
> {{now.plusDays(1).shortDay}}

...because you're calculating days v. hours? Or is it in fact ".shortTime"?  

Thank you so much! This was really helpful [@Aron Gombas _Midori_](/t5/user/viewprofilepage/user-id/502447) !


Tags: cloud

confluence-cloud
Email Notifications for tasks
Asked by Richard Eaton:

In Confluence if I Tag someone @'User' with a task or I want them to see something for them to look at the email notification is being received. I checked and made sure the email under the further configuration is set as well as user subscribed to emails. What am I missing?


Answers:
author: Justyna Gdowik _ Deviniti _
body: There are some options you may try:

* Check the global email configuration for your Confluence instance. Verify that the SMTP server settings are correct, and there are no issues with sending emails from the Confluence server.  
  <https://confluence.atlassian.com/doc/configuring-a-server-for-outgoing-mail-151078.html>
* You may want to check the Further Configuration settings. Navigate to Confluence settings by selecting (Settings) in the Confluence navigation, and then choose Further Configuration. Verify that the email notifications are indeed enabled for your instance.   
  <https://support.atlassian.com/confluence-cloud/docs/subscribe-to-email-notifications/>
* Also, try tagging different users and using different content to see if the notifications work for them. This will help determine if the problem is specific to the tagged user or if it's a broader issue.

Good luck!


Tags: cloud

confluence-cloud
Automatically update references to a Confluence article after the name has been changed
Asked by Gerard McHale:

I want to rename a Confluence article. This article is referenced in multiple other places. Is it possible to rename the page in such a way that the links to the page will be updated at the same time as the page is renamed?

Without this, the reference links will be broken unless I manually find all those references across other pages and update them manually.


Answers:
author: Brant Schroeder
body: [@Gerard McHale](/t5/user/viewprofilepage/user-id/1396165) It depends on how the link was created. If you used the page and identified it in the link macro then it will use the page ID and the name change will not matter. If you used a custom link then you will need to update it. <https://support.atlassian.com/confluence-cloud/docs/insert-links-and-anchors/> You could look at a few pages and see but most likely the link was created using the page ID as you would need to specify on the left-hand side of the macro to use a different link functionality. I would suggest changing it and testing a few of the pages that contain links.


Tags: cloud

confluence-cloud
Creating Dynamic URL onCreated
Asked by Chris Iacovelli:

I am trying to set a field in my Confiform record when created to a URL which will:

1. drive the user to a differing page for viewing
2. filter the page to only show a specific record

I know I can set a value via the "Parameters to set on the entry" field, but when using the cf flag to do the required search/filter when setting the value, I do not get the remainder of the string due to the second ampersand sign being evaluated to spaces e.g.:

*entryId=\[entry.id\]\&intakeURL=<https://collaborate.compSite.com/pages/viewpage.action?pageId=1987475592>* **\&** *cf_search_OpIntake=intakeID:\[entry.intakeID\]*

I suspect the operation is trying to set the value of a non-existent field called "cf_search_OpIntake" to the value contained in \[entry.intakeID\] because the resulting value that that is placed in the field is:

*<https://collaborate.compSite.com/pages/viewpage.action?pageId=1987475592>*

My question is, is there anyway to "escape" the meaning of the second ampersand?

If there is no way, anyone have a creative solution on how this can be done?


Answers:
author: Alex Medved _ConfiForms_
body: Hi [@Chris Iacovelli](/t5/user/viewprofilepage/user-id/1199594)

Consider dynamically creating link, setting ConfiForms Field macro's field name parameter to be something like this (instead of using the IFTTT macro)

```
intakeID.prepend(https://collaborate.compSite.com/pages/viewpage.action?pageId=1987475592&cf_search_OpIntake=intakeID:).asLink
```

Alex

comments: author: Chris Iacovelli
body: [@Alex Medved _ConfiForms_](/t5/user/viewprofilepage/user-id/781630) - i was just looking at that. thanks for pointing me there as well.


author: Chris Iacovelli
body: [@Alex Medved _ConfiForms_](/t5/user/viewprofilepage/user-id/781630) you are the man, again!

![WHO DA MAN? YOU DA MAN!!! Poster | luzjohnson | Keep Calm-o-Matic](https://sd.keepcalms.com/i-w600/who-da-man-you-da-man.jpg)


author: Alex Medved _ConfiForms_
body: A-ha-ha, thank you :-)


Tags: confiforms

confluence-server

server
Python API error
Asked by nannan666:

Hi Sir

I want to use python get my page by API ,but i have met an error:

<https://github.com/atlassian-api/atlassian-python-api/tree/master/examples/confluence>

my page addr:

<https://nannan666.atlassian.net/wiki/spaces/CHARTGPT/pages/98517/Oscillation+Detection+Spec>

Code:  

```
# coding=utf-8
from atlassian import Confluence

confluence = Confluence(url="https://nannan666.atlassian.net/wiki", username="nannan666", password="xxxx")

# If you know Space and Title
content1 = confluence.get_page_by_title(space="CHARTGPT", title="page title")

print(content1)

# If you know page_id of the page
content2 = confluence.get_page_by_id(page_id=98517)

print(content2)



log:
urn complexjson.loads(self.text, **kwargs)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 raise HTTPError(http_error_msg, response=self)
requests.exceptions.HTTPError: 401 Client Error: Unauthorized for url: https://nannan666.atlassian.net/wiki/rest/api/content?type=page&start=0&limit=1&spaceKey=CHARTGPT&title=page+title


```


Answers:
author: Graham Twine
body: Hello [@nannan666](/t5/user/viewprofilepage/user-id/5226240) ,

Have you tried to access the URL from a third party application like Postman or Insomnia first?

This is a good place to start so you can confirm you are setting up the call correctly.

Consider request headers as well.

I am not familiar with the library you are using but try and get this working with the Python requests library or the http.client libraries first.

Also try and call yourself in the first instance.

`/confluence/rest/api/user/current`


Tags: cloud

confluence-cloud
Extending the date range of analytics in Confluence 7.20.0
Asked by Scott Allen:

I'm trying to cleanup our Confluence instance and wondering if there is a way to extend the analytics date range to like 2 years? Some posts say it can be done by configuring the Analytics for Confluence - Plugin but configuration isn't an option.


Answers:
author: Aron Gombas _Midori_
body: What does it precisely mean "configuration isn't an option" ?

You can't choose "2 years" in the period selector? Something else?


author: Scott Allen
body: No.....When I open the Analytics for Confluence - Plugin there is no option for configuration.


Tags: confluence-server

server
How can i create a new project
Asked by Iria Pi?eiro Fraga:

Good afternoon,

I would like to create a new project in Jira/Confluence

To whom should i contact or how can i do it?

Many thanks

Regards


Answers:
author: Alex Koxaras _Relational_
body: Hi [@Iria Pi?eiro Fraga](/t5/user/viewprofilepage/user-id/5226271) and welcome to the community,

In Jira you have to have the "administer jira" global permission to create company managed project, and/or a jira administrator should have given the users the global permission to create Team Managed projects. If you can't do any of this, contact your IT, who should know who the jira admin is.

In confluence you can create a space if the necessary permission has been granted to you by the site admin. If enabled, you are eligible to create a personal space, and most likely this is automatically created by Confluence. Again, if you are not able to create any of these, then contact your IT, who should know who the jira admin is.


Tags: cloud

confluence-cloud