youngmon/atlassian-qna huggingface dataset:
How to get out of the rebasing state
Asked by MikeL:

Well, the title already says it.


Answers:
author: stevestreeting
body: Either 'Commit' or 'Pull' will detect the rebase state and direct you to the rebasing options you have to proceed.

comments: author: MikeL
body: I don't want to Commit, but instead abort the rebase. Pull/fetch does not work for me at all - see my first answer.


author: stevestreeting
body: This is the dialog which is displayed when your repo is in the rebase state, when you click either Pull, Commit, or right-click anything and select 'Rebase' again: <http://www.screencast.com/t/B24xnvwPiDAd.> Just click 'Abort Rebase'. You don't actually have to commit or do any other actions, this comes up first.

If this dialog doesn't appear, your repo is not in a rebase state (no .git/rebase-apply).


author: MikeL
body: Ah, OK. If I recall correctly, there are three options when a rebase stopped - continue (conflict has been solved), skip and abort. It looks like SourceTree does not handle the second option?


author: stevestreeting
body: "rebase --skip" is just a special case of "rebase --continue" - it's just that you discard your current changes. Many people find skip/continue ambiguous for this reason.

SourceTree will automatically issue "rebase --skip" if you opt to "Continue Rebase" and there are no changes in the working copy. Therefore to skip, you just discard your changes and continue. Personally I think this is more intuitive and clear about your intentions - it also means that if you progressively discard changes and end up with none left, you don't have to pick a different action - 'Continue' just does the right thing.


author: Eugene Porubaev
body: When you are in the "Rebase" state, your repository will have orange \[Rebase\] badge in the repositories list.

![Screen Shot 2020-02-26 at 14.48.03.png](https://community.atlassian.com/t5/image/serverpage/image-id/84454i423134AB96BFBB5B/image-size/large?v=v2&px=999 "Screen Shot 2020-02-26 at 14.48.03.png")

To exit this state you:

1. Open the repository
2. Press "Pull"
3. Press "Abort" on the "Abort rebase" prompt.![Screen Shot 2020-02-26 at 14.48.35.png](https://community.atlassian.com/t5/image/serverpage/image-id/84455i4526331BCBF846ED/image-size/large?v=v2&px=999 "Screen Shot 2020-02-26 at 14.48.35.png")
4. Press "Cancel" on the final Pull prompt.


author: stevestreeting
body: "rebase --skip" is just a special case of "rebase --continue" - it's just that you discard your current changes. Many people find skip/continue anbiguous for this reason.

SourceTree will automatically issue "rebase --skip" if you opt to "Continue Rebase" and there are no changes in the working copy. Therefore to skip, you just discard your changes and continue. Personally I think this is more intuitive and clear about your intentions - it also means that if you progressively discard changes and end up with none left, you don't have to pick a different action - 'Continue' just does the right thing.


Tags: rebase
SourceTree can't display Japanese UTF8 filename
Asked by Tadatoshi Sekiguchi:

Hello,

I found that SourceTree can't show Japanese file name correctly. Also it can't add/rm the file correctly.

I don't try but Other non-English language (Chinese or so ) will be as same result.

Is there any solution for this?


Answers:
author: stevestreeting
body: <http://confluence.atlassian.com/display/SOURCETREEKB/UTF-8+Characters+Show+in+SourceTree+as+Escaped+Character+Codes>

comments: author: Tadatoshi Sekiguchi
body: It worked! Thank you.


Tags: language-ja
calculate days between date & today?
Asked by Tom Murphy:

I'm trying to calculate the duration between a date in a a COnflulence page, ant today. Can I do that with the existing Confluence Server, or do I need a third-party add-on?

Thanks for your help,

-Tom


Answers:
author: Fabio Racobaldo _Herzum_
body: Hi [@Tom Murphy](/t5/user/viewprofilepage/user-id/5031520) ,

you caould do that through a your own macro. Please take a look to the following how-to guide <https://confluence.atlassian.com/doc/writing-user-macros-4485.html>

Obviously you need to write some simple code.

Fabio


Tags: confluence-server

server
show different color for remote branch
Asked by Siu Man Hsieh:

hi

I am using git-p4 to sync perforce with my local git repositiory.

some how in source tree, p4/master and p4/HEAD are displayed in pink, which is the same color as local branches.

Is it possible to have them displayed in differenat colors?

Also is there a way to hide HEAD and remote HEAD? at least when HEAD is pointing to a named branch/tag?

thanks

mone


Answers:
author: stevestreeting
body: The branch \& tag colours match the graph colour to help you associate them.

The icons on the labels show what type they are. Local branches have a blue branch icon, remote branch icons are grey (and they also have the remote prefix anyway).


author: stevestreeting
body: Also I think it's still useful to display HEAD even when you're on a branch - it's very quick to pick out in the log that way.

comments: author: Siu Man Hsieh
body: The branch that HEAD points to is already in bold color. I feel it's redundent information. If you look at the way gitX presents the history view, it's much cleaner.

In my situation, the p4/\* remote branch is not in different color. Also they are not shown under remote group on the left panel. It maybe a bug. Again gitX does it fine and the history view is beautiful. I like everything about source tree but the history view just makes me want to go back to gitX.


author: stevestreeting
body: If the p4/\* isn't under the Remotes section, it's almost certainly not a remote branch, which is why it's in the local branch colour. If you think it is, please provide some kind of example repo I can look at.


author: Siu Man Hsieh
body: But git branch -r shows that they are remote branches and GitX shows them fine.

!529 \[12:44:05\] $ git branch -r

p4/HEAD -\> p4/master

p4/master


author: Siu Man Hsieh
body: i created a sample .git that demostrate the problem. Can I send it to you through email?


author: stevestreeting
body: Please can you log a bug at <http://jira.atlassian.com> - you can attach the repo to that. Thanks!


author: Siu Man Hsieh
body: sorry, it's for source tree.

I throught the tag "sourcetree" was for that purpose.

mone

comments: author: AlexH
body: Ahhh, I see that now... apparently it's too early in the morning for my brain to make the connection between Atlassian and their recently aquired Sourcetree app. Sorry :)


author: AlexH
body: It would help if you mentioned which product you were asking questions about.

Fisheye? Bitbucket?


author: AlexH
body: It would help if you mentioned which product you were asking questions about.

Fisheye? Bitbucket?
Are child pages archived along with parents pages?
Asked by kshields:

Are child pages archived along with parents pages?


Answers:
author: G subramanyam
body: Hi [@kshields](/t5/user/viewprofilepage/user-id/3909355) welcome to the Atlassian community.

The answer to your query depends on whether you are on free/ standard/ premium plans.

Please go through the details on this [Archive pages](https://support.atlassian.com/confluence-cloud/docs/archive-pages/) documentation.


author: Mylah32
body: 1. Navigate to the parent page and choose \> Delete.
2. Choose Also delete child pages then hit Next.
3. We'll warn you of any issues, such as incoming links that will break. Choose Delete to proceed[.](https://buyozempiconlinecanada.com/)


Tags: cloud

confluence-cloud
How to search for user mentions using the livesearch macro?
Asked by LookingForHelp:

Hi there,

I added [the livesearch macro](https://confluence.atlassian.com/conf713/livesearch-macro-1077913709.html) to a page. I want to use the macro to find other pages where a specific user is mentioned. For example, when typing "Superman", I want to find all pages of a defined space, where the user Superman ist mentiond (@Superman).

Using the macro to search for other content works fine. However, I cannot find user mentions.

Do you know how to do that?

Best,

LookingForHelp


Answers:
author: Nicolai Sibler
body: Hi [@LookingForHelp](/t5/user/viewprofilepage/user-id/5212560) ,

I'm afraid the Livesearch Macro won't do the job.

You may think about this workaround:

* Type the username (! not the full name that is @mentioned) in the regular search field, filter results to the desired space and the content type *page*.

Note this will only work if the usernames in your instance are designed in a way they wouldn't appear in a regular text. (In my instance this works bc usernames consist of an alphanumeric key). If this is not the case for you, click on "Advanced search". On the results page you can not only filter by content type and space, as you know it from the quick search, but also add the filter *Mentioning user* at the bottom left. In this case you wouldn't need to enter anything in the search field.

Hope that helps!

Kind regards,

Nicolai


author: G subramanyam
body: Hi [@LookingForHelp](/t5/user/viewprofilepage/user-id/5212560) welcome to the Atlassian community.

Please be informed, when you search for the specified person with @ mentioned, the spaces data will populate for that user per their contributions.

Alternatively, their profile will also be visible in the search results. You can click on that tagged person profile and see the complete list of activities across the spaces.
Access all past editors of a page?
Asked by Denver Thomas:

I was browsing the Class AbstractPage Atlassian resource here:

[AbstractPage (Atlassian Confluence 5.9.7 API)](https://docs.atlassian.com/atlassian-confluence/5.9.7/com/atlassian/confluence/pages/AbstractPage.html)

Because I'm wondering if, in Confiforms, I can access all the previous editors of a page, or if I'd have to track that sort of information myself. I see I can access "last modifier" and "created by", but I'd also want everyone in-between.  

Looking to have a "Contributors: person A, person B, person C, person D, . . . " section at the bottom of certain content pages.


Answers:
author: Denver Thomas
body: I believe I may have already found a solution in the form of the "Contributors" macro . . . Checking it out


author: Alex Medved _ConfiForms_
body: Hi [@Denver Thomas](/t5/user/viewprofilepage/user-id/5175000)

Where specifically you want to access page contributors?

Alex

comments: author: Denver Thomas
body: I just wanted a "Revision History / Contributors" expandable section at the bottom, and the Contributors macro is basically doing the job I need. Thank you, Alex!


Tags: cloud

confiforms

confluence-cloud
Smart Value for most recent page author
Asked by Zack Howard:

Hello all, I am working on automations for our confluence space and am running into an issue. I want to notify people that their pages need review. I've set a rule to notify the page owner if their page has not been edited in 6months. The issue is that we have a lot of pages created by authors that are no longer with the company. So I would need to instead notify the person who most recently made changes to the page instead.

I cannot seem to find a smart value for this in the Documentation. If I missed this please let me know!


Answers:
author: Andy Gladstone
body: [@Zack Howard](/t5/user/viewprofilepage/user-id/5076167) unfortunately there are no Smart Values for editors and contributors, only for authors of the original page and authors of comments. I looked in JAC and don't see a request for this yet, you may want to add it to <https://jira.atlassian.com/browse/CONFCLOUD>.

Sorry it was not a positive response!

comments: author: Zack Howard
body: Apparently I can't submit my own ticket there, but I'll follow those instructions:  
![Screenshot 2023-05-08 105808.png](https://community.atlassian.com/t5/image/serverpage/image-id/255826iC0FFFCEF5F8EAFD8/image-size/large?v=v2&px=999 "Screenshot 2023-05-08 105808.png")


author: Sheerine Baucum
body: Hi [@Zack Howard](/t5/user/viewprofilepage/user-id/5076167) yes, this is unfortunately not available at this time, but if you submit a request we will monitor the feedback to help prioritize this change.


author: Andy Gladstone
body: [@Zack Howard](/t5/user/viewprofilepage/user-id/5076167) as [@Sheerine Baucum](/t5/user/viewprofilepage/user-id/4751651) and I did provide the correct answer to your inquiry, can you please mark it as accepted so that others looking for similar issues can more readily find it? Thank you.


author: Barbara Szczesniak
body: [@Zack Howard](/t5/user/viewprofilepage/user-id/5076167) I'm not sure if this will answer your question, but this post was in the digest right after yours: [Access all past editors of a page](https://community.atlassian.com/t5/Confluence-questions/Access-all-past-editors-of-a-page/qaq-p/2351735?utm_source=atlcomm&utm_medium=email&utm_campaign=digest_notification&utm_content=post)

comments: author: Zack Howard
body: Ah, that is a neat feature, thanks for sharing that! I might use it for some things in the future. I need a smart value for Automations though, and it doesn't seem like there is one... yet =P


Tags: automation

cloud

confluence-cloud

smart-value
Which Page correspond to wich ID
Asked by Jacynthe_Thibault:

Hi,

We run this request to have the users who have seen the pages lats time.

SELECT \*

FROM "AO_92296B_AORECENTLY_VIEWED"

JOIN user_mapping u ON u.user_key = user_key

ORDER BY "LAST_VIEW_DATE" DESC;

It gives something like this, my question is how can I know which ID corresponds with which page?

|------------|-------|----------------|-----------|--------------------------------|--------------|-------------------------------|----------|----------------|
| CONTENT_ID | ID    | LAST_VIEW_DATE | SPACE_KEY | USER_KEY                       | CONTENT_TYPE | user_key.1                    | username | lower_username |
| 2639467    | 12200 | 2 mai 2023     | SpaceX    | ff8080817bab80a2017bd147680003 | PAGE         | ff8080817bab80a2017bd17680003 | njoi     | njoi           |
| 1156057    | 344   | 2 mai 2023     | SpaceY    | e4e4824c5d6705d1015957530002   | PAGE         | e4e4824c5d6705d10154957530002 | jkiu     | jkiu           |
| 2127301    | 1223  | 2 mai 2023     | SpaceZ    | e4e4824caa9601429fab118100c4   | PAGE         | e4e4824c429faa9601429118100c4 | dfh      | dfh            |

<br />

Thanks


Answers:
author: Ken McClean
body: It's been a while since I looked at the database. It used to be that in Confluence, the table that contains the correlation between ID and page name is the `CONTENT` table. Maybe check and see if that table still exists, and do a join if so.

comments: author: Jacynthe_Thibault
body: Thanks I have the answer with ChatJPT who gives me a powershell script to retreive the page url. :)


Tags: cloud

confluence-cloud
PDF Export css - add a left hand strip
Asked by Anna Paaske:

I need to add a solid colour strip that to the left hand side of the document. The strip needs to be around 7mm wide and 100% tall and have no top, left and bottom margins.

Is this possible? How can I achieve this?

Thanks!


Answers:
author: Alex Koxaras _Relational_
body: Hi [@Anna Paaske](/t5/user/viewprofilepage/user-id/4951548)

Try adding this to your pdf stylesheet:

```
@page 
{
margin: 0.5in;
padding: 1em;
border-left: 6px solid green;
@top-left
{
content: element(header);
}
@bottom-left 
{
content: element(footer);
}
}
```

The result will be something like this:

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


Tags: cloud

confluence-cloud

pdf-export
How to batch upload Confluence pages from an excel spreadsheet
Asked by Debbie DeLoach:

How would a person create many Confluence pages (Blank pages) at one time by using an excel spreadsheet?

The goal is for each row on an excel spreadsheet to be used to create a Confluence page.

Thank you.


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

you need to write code to do that. A script that read your excel and call a specific rest api to create content (<https://medium.com/@abhishek67parmar/creating-a-confluence-page-with-rest-api-c2a8efc6f546>)

Hope this helps,

Fabio


Tags: cloud

confluence-cloud
Will postgreSQL 15 work with Clonfluence 8.2?
Asked by Alex DeBarro:

I am looking at updating my on premise Confluence from 7.18.1 to 8.2.2 and in the pre checks it tells me my version of postgreSQL won't be supported. Am I to assume moving to a later version is going to cause my newer version of postgreSQL to stop working or is it just not "officially" supported? Everything is working just fine with the current set up so I can't see reason to think it won't; but I would like to be sure before I go ahead and break everything!  

For reference here is exactly what Confluence is telling me in the 'plan your upgrade' section:  

We've analyzed your instance, and here's what we found:  
Your current database version won't be supported. Learn more  
We recommend that you fix these for a successful upgrade.


Answers:
author: Fabio Racobaldo _Herzum_
body: Hi [@Alex DeBarro](https://community.atlassian.com/t5/user/viewprofilepage/user-id/5212324) and welcome,

confluence 8.2 version supports Postgres 12,13 and 14. More information about supported platforms can be retrieved here <https://confluence.atlassian.com/doc/supported-platforms-207488198.html>

Hope this helps,

Fabio


Tags: confluence-server

server
Keep Knowledge Base navigation within the Knowledge Base!
Asked by David Harkins:

We are creating knowledge base articles for Jira Service Management using confluence.

Our users access the content via the Portal Knowledge Base.

Articles are created in confluence and linked to other confluence articles, directly and with page tree macros.

However, when viewing as a user from the Portal, clicking any of the links on the articles directs the user out of the Portal Knowledge Base and to the confluence page.

Where they do not have any permissions to log into confluence.

Can links be created on articles to other articles, to ensure a portal user remains inside the portal knowledge base?


Answers:
author: Dan Breyen
body: Hi David, I see you're on JSM Server. I'm on the cloud. Previously if my portal user gets to a Confluence page that has JIRA links on it, they would get a screen about needing a Atlassian login. If they had a proper Atlassian account, they could actually get to the JIRA link on my conf page. Currently if they click on a Jira link, it takes them back to the Portal page. Clicking on a Confluence link now gives them a 'No Access' page.

It appears Atlassian made a change for this recently. I looked at Atlassian's JIRA site for an existing or fixed bug for Server, but couldn't find one that was still open. This one[JSDSERVER-5324](https://jira.atlassian.com/browse/JSDSERVER-5324) was closed for lack of interest. If this is the issue, maybe a new ticket needs to be created.

Hope that helps.

comments: author: David Harkins
body: [@Dan Breyen](/t5/user/viewprofilepage/user-id/5086375) Thanks,

I've looked over [\[JSDSERVER-5324\] Other Spaces and Pages Accessible From Knowledge Base article - Create and track feature requests for Atlassian products.](https://jira.atlassian.com/browse/JSDSERVER-5324) and that appears to be more of permissions issues than what I am experiencing.

Our users cannot log into Confluence, the links being displayed on the Knowledge base articles are directing them to the page in confluence, when they should remain in knowledge base.


author: Dan Breyen
body: Sounds like it's worth opening a Support ticket for further assistance. I agree that shouldn't happening for Portal Users. Another option would be to create Confluence pages in your KB that are only meant for Internal Customers where they may have more Confluence access than just to the KB.


Tags: confluence-server

customer-portal

jira-service-management

knowledge-base

server
How do i configure application links correctly (static snapshot is not working)
Asked by Andreas Schierz:

Hi,

not sure if this is the right platform for my question, but let?s try:

We use the app "static snapshot". It takes snapshots from Jira filters on the page. This worked until december 2022.

Since then "com.atlassian.confluence.api.service.exceptions.PermissionException: Apps are not allowed to make requests using Application Links." is shown instead of the jira filters.

We use confluence cloud and jira server. Of course i set up the application links (QAUTH)

any ideas?

kr

Andy


Answers:
author: Alex Koxaras _Relational_
body: Hi [@Andreas Schierz](/t5/user/viewprofilepage/user-id/706464)

In order to connect your confluence cloud with your jira instance you should go to:

* Cog wheel
* Applications
* Confluence cloud migration

However keep in mind that impersonation isn't working on cloud.

comments: author: Andreas Schierz
body: Hi,

thx for the answer. Unfortunately, there is no "confluence cloud migration". And as i posted: it used to work in the configuration jira server and confluence cloud already, but stopped suddenly...

regards

Andy


author: Alex Koxaras _Relational_
body: The log files can be a source of truth then. Did you happen to check them?


author: Andreas Schierz
body: Sorry for replying this late...

Which logfiles do you mean? i digged through all, but could not find any help.


author: Alex Koxaras _Relational_
body: The log files from jira server.


Tags: cloud

confluence-cloud

jira-server
Page Properties Report - How to select to display a column title on 2 lines (carriage return) ?
Asked by C?dric Templie:

Hello,

I am using the combination of Page Properties and Page Properties Report.

In my Page Properties table, one of the column title is on 2 lines.

I cannot find a way to only select this column in the "Column To Display" option of the Page Properties Report.  
I think it is needed to provide the formatting (the carriage return in fact) so that the macro can catch the right column. But how ?

Thank you very much in advance for you help.

Regards

C?dric


Answers:
author: Nicolai Sibler
body: Hi [@C?dric Templie](/t5/user/viewprofilepage/user-id/1118308) ,

This should work if you use a hard carriage return (Shift+Enter) instead of a regular carriage return (Enter) in your column titles.

Note this will reduce the space between your two lines in the table cell. Will be still visible as two lines though.

Hope that helps!

Kind regards,

Nicolai

comments: author: C?dric Templie
body: Hi [@Nicolai Sibler](/t5/user/viewprofilepage/user-id/2649119) ,

Thx for the proposal.

I tried but still cannot successfully "select" the column for display in the Page Properties Report.

What should be the format ?  

Let's assume I have the following in Page Properties.  
*ColumnX Line1 (Shift + Enter)*   
*ColumnX Line2*

How this should be in the Page Properties Report, in "Column to Display" field ?  
Should I add a special character somewhere ? like \\n or \<br\> (so far I tried both but not working)

*ColumnX Line1\\nColumnX Line2*   

As a side note, If "Column to Display" is empty, all columns are well displayed, even if there are several lines in the title, whenever I used Enter or Shift+Enter by the way.  

My problem is really to select that single column that has multiple lines...

Thx again


author: Nicolai Sibler
body: You'd treat the column title as if it was in one line.

I left a whitespace before the line break in the Page Properties Macro:

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

Next I selected the title as if it was in one line (because technically it is).

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

Without the whitespace (Shift + Enter directly after the **w**), I would have to select "newline".


Tags: confluence-server

page-properties-macro

page-property

server