youngmon/atlassian-qna huggingface dataset:
SourceTree can't amend last commit
Asked by DmitriM:

Hello,

When I commit to a mercurial repository, SourceTree commit window doesn't have the checkbox for amending the last commit.

How can I amend the last commit?

Regards,

Dmitri

![](../../../upfiles/Screen_Shot_2012-08-05_at_9.27.35_AM.png)


Answers:
author: stevestreeting
body: Mecurial doesn't actually have the 'amend commit' feature, but it has another feature which you can use.

In Mercurial, you can 'strip' commits, which SourceTree exposes in the log view context menu. If you right-click a commit and choose 'Strip from here', it will destroy that commit at all of its children. However, if you check the box 'Do not modify working copy', you can keep all the changes, and they will become uncommited changes which you can then commit again. So this is similar to the idea of 'amend last commit' if you use it on the latest commit and check the 'Do not modify working copy' box (very important!), then commit again, although Mercurial does this a bit differently.

comments: author: DmitriM
body: Thank you for the answer. I agree what you suggest would work. However, mercurial actually does support amend. Here's a quote from online help for **hg commit** command:

*The --amend flag can be used to amend the parent of the working directory*

*with a new commit that contains the changes in the parent in addition to*

*those currently reported by "hg status", if there are any.*

Perhaps, internally it indeed strips the parent commit and commits the combined changes of the parent commit and working directory, but it doesn't matter much for me what's behind the scene.

I assumed SourceTree would be able to do the same without me having to do two operations (strip and commit) instead of one (amend parent commit), but, apparently, it's not.


author: stevestreeting
body: Ah OK, this appears to be a new feature in hg 2.2, it wasn't supported before that. We still support system Mercurial versions prior to 2.2 but we may add this option in future then.
viewing history of changes (log?) of a given file
Asked by Peter Galvin:

Hi, there is probably a way to do this but I'm new to sourcetree so probably missing it. Thoughts appreciated.

I can use the "file status view" to navigate to a specific file I want to know more about. But I haven't made changes to the file - rather I want to see the history of that file (for example who made the last change and what that change was, who created it when, etc).

Can't seem to find a way to do that.

Thanks much.


Answers:
author: stevestreeting
body: Hi Peter,

You can right-click on a file in any of the views and pick 'Log Selected' from the context menu - this will give you the entire history just for that file. If you want, from there you can double-click on any commits that changed that file to see the rest of the changes in context.

HTH  
Steve


author: Peter Galvin
body: Thanks Steve, I knew I was missing it. Note that searching for the answer via help within the app didn't show that. Also I thought that was an active command - as in "make a log entry for the selected entry" so maybe "view log selected" might be clearer.

Much appreciated!
git subrepo
Asked by Roland Roland:

Our company SVN is Mercurial. As our software consists of many modules we enjoy the subrepo feature of mercurial. every now and then I would like to add a Git repo as a subrepo in my projects. I have the Hg-Git extension installed on my machine. The problem is that other co-workers can't commit to this projects if they don't have hg-git installed. Does sourcetree support git subrepos natively?


Answers:
author: stevestreeting
body: SourceTree doesn't require the Hg-Git extension to use git subrepos inside a hg repository (I have a few cases of this myself). Mecurial natively supports having git repositories as subrepositories, and this is how SourceTree supports them too. Using Hg-Git would turn the subrepo into a hg subrepo (but converted via Hg-Git to interop with remote git), which as you say would cause a problem for people without this extension. On the whole I think it's simpler just to use the git subrepo natively unless you have a good reason not to.

comments: author: Roland Roland
body: Hello Steve,

thanks for your answer. This is good news. I thought it would be much more complicated.


Tags: git
Is there a way to use custom git-flow installation in SourceTree?
Asked by Ilya Bogdanovich:

In my team we use custom build of git-flow, which has some extra features. It would be extreamly helpful for us to tell SourceTree alternative git-flow installation, like it could be done with git.


Answers:
author: stevestreeting
body: The reason there isn't a 'system git-flow' setting is that I had to make a couple of changes to git-flow to make it work well from a GUI. I submitted pull requests for those change and you can find them here:

<https://github.com/nvie/gitflow/pull/222><https://github.com/nvie/gitflow/pull/223>

So, any custom version of git-flow would have to have those 2 pull requests applied. Provided you do that, it's possible to use your modified git-flow in SourceTree by manually replacing (or symbolic linking) the directory "SourceTree.app/Contents/Resources/git_local/gitflow/".

I was hoping no-one would need to do this to be honest, but you're now the second person to ask. What I may do for the next version is expose a way to redirect this but with strong warnings to check out the pull requests above.

comments: author: stevestreeting
body: Oh, actually I just noticed that nvie has pulled them both into the standard git-flow now, that's awesome and makes this much easier to support in future. I wonder why I didn't get an email about that.

\[edit\]Still, the changes are only in the develop branch right now and not in the main release so it's still important to check them.


author: Ilya Bogdanovich
body: Thanks, this worked for me. One more question: in our custom git-flow, we have an extra stage - for code review. So full cycle looks like start-publish-review-finish. Is there any way to add an extra step to SourceTree UI?


author: stevestreeting
body: You can add any commands you like to SourceTree using Custom Actions, which has its own tab in the Preferences window. It won't be as pretty of course, but you can hook in almost anything you need there.


author: kendallb
body: Is it possible to do this for Windows? I can't seem to find where the gitflow stuff is stored.

The only change I would like is for the ability to automatically create a mirror branch on the remote repo. I work from both my work computer and home computer but they are not the same computer (work is a Mac Pro, home is a MacBook pro :) ). So to access stuff from home at work (or vice versa), I have to push it up so it adds another manual step that I sometimes forget to do ...
Confluence Search API endpoint does not seem to support expand query parameter
Asked by Praveen Kukreja:

I tried varied API requests in confluence using the /search endpoint. I noticed that the expand query is not working just like it works for other endpoints (/space, /content).

For example in the below requests, there are _expandable properties that are not being expanded:

\`[https://abc.atlassian.net/wiki/rest/api/search?cql=type='attachment'\&expand=extensions.fileType](https://abc.atlassian.net/wiki/rest/api/search?cql=type='attachment'&expand=extensions.fileType)\`

\`[https://abc.atlassian.net/wiki/rest/api/search?cql=type='attachment'\&expand=metadata](https://abc.atlassian.net/wiki/rest/api/search?cql=type='attachment'&expand=metadata)\`

Am I missing something here ?


Answers:
author: Praveen Kukreja
body: After hours of looking into discuss forum, I somehow found that you need to use word **content** before each expandable parameter.

So you need to change the above calls to:

\`[https://abc.atlassian.net/wiki/rest/api/search?cql=type='attachment'\&expand=content.metadata](https://abc.atlassian.net/wiki/rest/api/search?cql=type=%27attachment%27&expand=extensions.fileType)\`

It's a true marvel how Atlassian manages to keep the secrets of their documentation locked away, leaving us to stumble in the dark, blindly searching for the missing puzzle pieces.

comments: author: Will Marsman
body: ive been fighting this for the last two hours. i don't understand why they can't include a working example in the docs.


Tags: api

cloud

confluence-cloud
How do we search for User created Confluence Templates pages
Asked by Patel Kala, Trupti:

Our Confluence instance needs a clean up, so we are looking into user created Confluence template pages. Hence If we get a help on how to search for the template pages would be helpful


Answers:
author: Nicolai Sibler
body: Hi [@Patel Kala, Trupti](/t5/user/viewprofilepage/user-id/5220711) , welcome to the Community!

Kindly specify what *user created Confluence template pages* means.

* pages that users created from templates?
* all space templates across the instance?

Kind regards,

Nicolai

comments: author: Patel Kala, Trupti
body: I am looking for all space templates across the instance


author: Nicolai Sibler
body: There is no good, quick solution for this that I know of. Maybe a DBA is able to build a query.   
As a workaround, you could use the space keys to check all spaces one by one, because the list of space templates has the following URL scheme:

```
https://[your.confluence.url]/pages/templates2/listpagetemplates.action?key=[Spacekey]
```

I am aware that this takes pretty much time if you have a lot of spaces - but at least it is faster than selecting all spaces individually via the space directory and then navigating to the template list.


Tags: confluence-server

server
Phishing attempt to our space
Asked by Peter Kohutiar:

Hello,

I\`m reporting a phishing site which one of our customers received as an invitation request to join our service desk trying to imitate our legitimate site.

[sign-up link](https://uk01.l.antigena.com/l/CfJgMcWJd8EFu0QQfXoqAQkmYS6ZFy-Fi7_gwyPeuxqDBl_tBfvcsAeOuxq_gxikKbMtCnopvj7iGqqbb34eKBIZJXDRk3MNGRF9DKBpPeBYlFqoJY3a2tQ4eaMXvxUwXpwJpvbMeOX2~LzIoVPuFx0fU1f5DpfcmD719KGsUwLzyYdagF3bX4WtC3DsEoY55hGW6bC1kyU8N-oWu1S8e0xKP10oYLbmHeOgObjDz-4mFsorevcHJus48Mmb-9xa5n~EcJt6tWHc9wCF7Wm44eL1BGcIIcbSODypQBqwSEA6nQF3ZLUzumaXzEm9qsp47p31piP26S3IHr4c7L)

This means the attacker has the customer email as well as knows our host service email which they tried to immitade


Answers:
author: Dan Breyen
body: Hi Peter, I would suggest reporting this to support.atlassian.com to get their feedback on the issue. They probably will respond faster that way.


Tags: cloud

confluence-cloud
What are ".tfss" and ".render"-files ?
Asked by Peter Krall:

After inserting an .xls, I also see two files with endings ".tfss" and ".render". Windows does not know what to do with them after downloading and the only information about ".tfss" files I found in the web referred to some kind of ransomware protection. Are these files automatically generated to enable recovery after a ransomware attack? Or what else is their purpose?


Answers:
author: Stiltsoft support
body: Hi [@Peter Krall](/t5/user/viewprofilepage/user-id/5220678) ,

Are we talking about the [Table Spreadsheet](https://docs.stiltsoft.com/tfac/cloud/how-to-use-table-spreadsheet-macro-83100938.html?utm_source=atl_community&utm_medium=answer&utm_campaign=table-filter-traffic-sources&utm_vendorID=1216111) macro provided by the [Table Filter and Charts for Confluence](https://marketplace.atlassian.com/apps/27447/table-filter-and-charts-for-confluence?tab=overview&hosting=cloud&utm_source=atl_community&utm_medium=answer&utm_campaign=table-filter-traffic-sources&utm_vendorID=1216111) app?

If this is the case, then .tfss and .render files are your attachments to the page where the Table Spreadsheet macro is inserted (they are generated automatically).

These files are used to store your data, assign versions (for example, you may export your spreadsheet in the .tfss format and import it somewhere else to another Table Spreadsheet macro and continue to work there) and perform page export (in pdf, for example).


Tags: filter

table

table-filter

table-filter-and-charts

table-spreadsheet
what ports should be enabled for a migration?
Asked by Esteban Tello:

I am migrating from confluence server to cloud and I need to know which ports to use and which internet ports to enable, greetings.


Answers:
author: Robert Wen_ReleaseTEAM_
body: Hello [@Esteban Tello](/t5/user/viewprofilepage/user-id/5220596) ! Welcome to the Atlassian Community!

This Knowledgebase article should help you out!

<https://confluence.atlassian.com/confkb/connect-the-confluence-cloud-migration-assistant-to-atlassian-cloud-976753742.html>


Tags: cloud

confluence-cloud
Can't edit page - Page restrictions don't match restrictions shown in Page Information
Asked by Sheila L:

I'm a space admin. On a set of pages, the editors have been restricted. (I clicked the lock button and looked at the restrictions.) I'm listed as an editor. However, on the Page Information page, I'm not listed as an editor.

As a result, I can't edit the page. There's no Edit button, and pressing "e" doesn't work.

What can I do?


Answers:
author: Rabia S_
body: Hi,

Sometimes, you can see yourself in restriction. If other person (can manage restriction) is not see you in restriction, have to add you as an editor in here. Can you try this?

And you can check Space Settings \> Permissions \> Restricted Pages.


Tags: confluence-server

server
Heading Numbering Error When Importing Word Document
Asked by Ecem Kan?y?lmaz:

Hi,

When we import the word document, the numbers at the beginning of the headings do not appear. For instance; the heading on the page only appears as 'Confluence' while the heading in the word document is '1. Confluence'.

How can we import word document properly?

Thanks.


Answers:
author: Dan Breyen
body: Hi Ecem, there are several issues I see in Atlassian's Confluence Server that seem to be related to importing of word documents. Here's a few:

[CONFSERVER-60076](https://jira.atlassian.com/browse/CONFSERVER-60076)

[CONFSERVER-51645](https://jira.atlassian.com/browse/CONFSERVER-51645)

[CONFSERVER-61082](https://jira.atlassian.com/browse/CONFSERVER-61082)

I would suggest taking a look at those. There may be other ones out there. Feel free to vote on and watch them.


author: Lisa
body: We are having a similar issue, and it seems our issue was reported as early 2013. When we import a Word document with numbered headers, all of the subheader numbering turns into "i." How can we preserve the numbering so that we can use Confluence as an easy reference for our team rather than relying on a Word upload they have to open?


Tags: confluence-server

import

server

word-document
Confluence Office Excel Macro donot show the option to upload the file.
Asked by Sanjog Sigdel:

Hello Community,

In Confluence I am not able to add an excel file from the Office Excel Macro and also not able to upload the file.

Can anyone guide me on how to make it happen?

![Screenshot from 2023-05-16 17-26-12.png](/t5/image/serverpage/image-id/257500i3AC6670C7E4B84F4/image-size/large?v=v2&px=999 "Screenshot from 2023-05-16 17-26-12.png")


Answers:
author: Becky Brooks
body: Do you already have the file you want to use attached to the page the macro will be on?

If not, try attaching the .xls file to the page, and then editing the macro and select the filename.

comments: author: Sanjog Sigdel
body: **[@Becky Brooks](/t5/user/viewprofilepage/user-id/4966917)**

**I uploaded a csv file so it didn't appear. Turned out uploading the .xlsx file and than using the Office Excel showed the appropriate attachment.**

Thank you for your help.


Tags: ms-excel

cloud

confluence-cloud

import
Jira Macro - User Picker is not showing name it is showing user ID
Asked by david cockrell:

Hi,

We are using Confluence (Data Center) 7.19.7

When using Jira macro we see that Assignee is displayed correctly: full Name

However "User Picker" (multiple users) is showing as user ID

is this a bug? how can we have it displayed as full name (user ID is useless for us)

Thanks.

David


Answers:
author: Florian Bonniec
body: Hi [@david cockrell](/t5/user/viewprofilepage/user-id/4392729)

I think you are facing this issue and there is no fix I'm aware of.

<https://jira.atlassian.com/browse/CONFSERVER-18505>

Regards

comments: author: david cockrell
body: [@Florian Bonniec](/t5/user/viewprofilepage/user-id/495589) Thanks!


Tags: confluence-server

server
What is the full process of implementing OAuth 2.0 in connect apps via JWT?
Asked by Saaket Gupta:

What is the full process of implementing OAuth 2.0 in connect apps via JWT?

The documentation mentions this but I fail to find the end to end process to implement it. I know I have to make changes in my descriptor file but need to know specifically what changes I need to make.

Also, I am calling the REST APIs with basic auth currently as mentioned everywhere in the REST API docs <https://developer.atlassian.com/cloud/confluence/rest/v1/intro/#about> and <https://developer.atlassian.com/cloud/confluence/rest/v2/intro/#about>.

How to replace this basic auth setup with the OAuth 2.0 setup. I already have installed ACE and am only having a webhook module inside it which calls webhooks events and I show them to my integrated 3rd party app's workspace channel (just like slack).

Please someone answer this and clear my doubts. Thanks in advance.


Answers:
author: David Bakkers
body: *"but I fail to find the end to end process to implement it."*

*"Always with you it cannot be done. This why you fail"* - **Yoda**

Start by Googling stuff like *'Atlassian implement OAuth 2.0 in Connect apps via JWT'.*If you had done at least that, you would have been led directly to the dozens of pages that guide you, step by step, EXACTLY how to implement OAuth or JWT based authentication in a Connect app.

Like the [Understand JWT for Connect apps page](https://developer.atlassian.com/cloud/jira/platform/understanding-jwt-for-connect-apps/), or the [Security for Connect apps page](https://developer.atlassian.com/cloud/jira/platform/security-for-connect-apps/), or the [OAuth 2.0 for apps page](https://developer.atlassian.com/cloud/jira/platform/oauth-2-3lo-apps/) or the [Getting started with Connect page](https://developer.atlassian.com/cloud/confluence/getting-started-with-connect/) that links to sample code, tutorials, introductions to using ACE etc, etc, etc.

Sorry to sound harsh, but if really, really want to become an application developer, you need to work on the core skills needed, like:

* Reading, reading and re-reading the documentation
* Trying the examples, doing experiments and seeing what results you get
* When it doesn't work, try to work out what went wrong... yourself
* Read, read and re-read the documentation again

The more you learn to solve your programming problems yourself and only ask for help when you've really, honestly tried everything in your power to work it out for yourself, the better your coding will always be.

Have fun on your learning journey [@Saaket Gupta](/t5/user/viewprofilepage/user-id/5205219)


Tags: ace

authentication

cloud

confluence-cloud

rest-api
When creating a bug it is not saving my template and removes it. Can anyone help?
Asked by Charlie Britner:

When I initally click create it creates the JIRA ticket where i can put in all my information (see first image). Using a custom field I have set up to have a template within it.

However when I click create in the bottom right of the first image after inputting the information. It deletes all the text that I had put into the description box (See second image)

Does anyone know what is causing this?![image.png](https://community.atlassian.com/t5/image/serverpage/image-id/257479i01EF239280C3C2D4/image-size/large?v=v2&px=999 "image.png")![image.png](https://community.atlassian.com/t5/image/serverpage/image-id/257480iED13DA4243759E98/image-size/large?v=v2&px=999 "image.png")


Answers:
author: Mayur Jadhav
body: Hello [@Charlie Britner](/t5/user/viewprofilepage/user-id/5220387) ,

Welcome to the Atlassian Community!!

After analysing the screenshot it seems that both the fields are different. In first screenshot your are trying to enter data in Custom field i.e Bug Description but in second screenshot the field is System field i.e Description.

Regards,  
Mayur

comments: author: Charlie Britner
body: Hi thanks for the quick reply Mayur.

I finally figured it out, so will leave this here in case anyone else is relatively new to JIRA and needs to know whats what

It was only using the screen I made for the create and not for the other 2 steps (edit and view issue). Setting this up has fixed the issue. This can be found in the Project settings\>Issues\>screens. Expanding the options on the page gave me a better depth of the steps.

Thanks!


author: Mayur Jadhav
body: [@Charlie Britner](/t5/user/viewprofilepage/user-id/5220387) that's correct, if the answer was helpful, please hit the accept button.


Tags: bug

cloud

confluence-cloud

template
How do I get you to stop spamming me?!
Asked by Confluenceisrubbish:

You are spamming me with emails, the unsubscribe button doesn't work. The support page doesn't work. There's no contact details to email anyone and the only way I could even post this comment is by creating a whole new email address because even though you have my email (since you are mailing me) you say my account is deactivated when I try to use it to log in.


Answers:
author: Andy Heinzer
body: Hi,

Sorry to hear that you received spam from one of our sites. If you could share with us the URL of that site that send this spam message, we can then work to take down that site and suspend the account responsible. The body of that message should give us additional information about the site that sent this message.

I understand if you do not wish to share the email address that you received this from, but without knowing the destination address, it hinders our ability to correctly identify this. In order to take action here we need to know more here.

Additionally, if you can post the message header from this received message, this can be helpful for us to backtrack the source of that message.


author: Jack Brickey
body: Greetings,

I have flagged your post to ensure that someone can have a look at your concerns. The Atlassian team is generally quick to respond so stay tuned.

Cheers!


Tags: atl-rvw