youngmon/atlassian-qna huggingface dataset:
How to Solve conflict file in git with same edit file with different commit?
Asked by mrhands:

Sory I'm newbie in using git.. I have small working team to manage my code with git. I have 4 members team include with me. And the question that I want to ask..

Suppose I have created file called `file.txt` and then I have added one line with my commit to the master branch with the default text

    "-----Text--------" 

And then 3 members others called `MrA`, `MrB` and `MrC`. Supposed it happends today with different file commit time.

`MrA` have been cloned the source and edited his work like this.

    "-----Text--------" Line added by MrA; 

And `MrA` commits to the remote repository in the server..

But at the same time `MrB` also have modified with the `file.txt` like this

    "-----Text--------" Line added by MrB; 

When `MrA` commit there's no problem since there's no body change before. Bur when `MrB` want to commit it has message error and get the conflict. And then `MrB` trying to pull has error also with the message you have to move `file.txt` or stash it to merge the content.

How can I suppose to do? I'm still newbie in Git. Thanks


Answers:
author: Seth
body: This may be way too late, but it sounds like MrB is trying to commit and push at the same time. He should be able to commit to his local repository without any error, then merge the older commit by MrA from the remote server (would happen with a pull), then push the merged code.


Tags: git
How do I report failures (not just minor problems).
Asked by Moby QT:

While I was working in confluence today, I ran into a serious problem (I could not create new pages).

The failure would show a return status that says "contact support", and that navigation lead me to asking a question in the community.

That workflow appears to fail, when I hit "publish", it sends me back to the product selector.  

I looked for a community discussion of that problem, and found nothing, so I thought I'd take a step back -\>

the overall problem I'm having today, I'm a paying customer, but none of these things makes sense, nor works, when I have an actual problem.

Is there some part of the UI I've missed?


Answers:
author: Moby QT
body: [@Barbara Szczesniak](/t5/user/viewprofilepage/user-id/5187859) - Thanks! I'll do that in the future.


author: Barbara Szczesniak
body: [@Moby QT](/t5/user/viewprofilepage/user-id/5119047) There was a partial outage of Confluence Cloud on June 14 that has now been resolved. There was also a recent issue affecting people's ability to edit and publish pages---might have been the AWS outage issue.

You might want to check the Confluence Status page (or subscribe to get emails about issues) to see if something is going on that explains the issue you are experiencing: <https://confluence.status.atlassian.com/>

You can click **Report a problem** at the top of the Status page to navigate to a page to submit a ticket to report an issue. If you are logged in, you can go directly to this page: <https://support.atlassian.com/contact/#/>


author: Collista Lewingdon
body: Good afternoon. Is there anyway that you can post a screenshot or screenshots of your screen? It is very difficult to try and help someone troubleshoot when we do not know what you are seeing.


Tags: confluence-cloud

cloud
Anchors gone? What feature is replacing?
Asked by Brittney Brice:

All of my anchors built into my documents are no longer working and it appears that Anchor functionality, along with table of contents has disappeared. Is there anew functionality that has replaced anchors? I need the ability to jump down to a specific section of the document rather than scrolling and searching.


Answers:
author: Brittney Brice
body: Thank you for the help - mine were not visible yesterday but looks like they are both back up today!


author: Barbara Szczesniak
body: [@Brittney Brice](/t5/user/viewprofilepage/user-id/5243709) I just tested in my space, and my anchors and TOC macros are working.

If you look in Edit mode, are the anchors and macros still there and unchanged? (I would hope another user would not edit an anchor!)

What do you see in the spot where the table of contents should be? Maybe someone changed the settings within the macro or the heading levels applied to your headings on the page.

Otherwise, you may want to submit a support ticket (I think you do this on this page: <https://www.atlassian.com/company/contact>).


author: Trudy Claspill
body: Hello [@Brittney Brice](/t5/user/viewprofilepage/user-id/5243709)

Welcome to the Atlassian community.

The Table of Contents macro is available in Confluence Cloud.

![Screen Shot 2023-06-14 at 4.39.16 PM.png](https://community.atlassian.com/t5/image/serverpage/image-id/263256iEA8FCDA073DD7C47/image-size/large?v=v2&px=999 "Screen Shot 2023-06-14 at 4.39.16 PM.png")


Tags: cloud
Migrating the Golink Data from Bluecrewjobs cloud to EmployeeBridge cloud
Asked by Sravan kumar:

Hi team,

Can you please provide the list of spaces where the Golinks are being used or provide the steps to find out how many spaces are being used?

Please provid ethe steps for migrating the data Golink data from bluecrew ([https://bluecrewjobs.atlassian.net/wiki/spaces/\~60af4d8e1ee723006c30c9c0/overview](https://bluecrewjobs.atlassian.net/wiki/spaces/~60af4d8e1ee723006c30c9c0/overview) ) to EmployeeBridge "<https://ebpp.atlassian.net/wiki/home>".

Thanks,  
Sravan Kumar.


Answers:
author: Sravan kumar
body: Hi team,  

Here is the link for "[https://marketplace.atlassian.com/apps/1226811/golinks-for-confluence?hosting=cloud\&tab=support](https://marketplace.atlassian.com/apps/1226811/golinks-for-confluence?hosting=cloud&tab=support)" Golink app.


Tags: confluence-cloud
How do I import a code from unix to build a confluence page ?
Asked by varun parmar:

Hi,

I want to display some data in a hierarchical reference format in confluence. To elaborate on hierarchical reference i mean user should be able to follow through by selecting a section which then expands the references beneath. Also knows as progressive disclosures tabs sometimes. Maybe expand macro is the one which I need if i can nest it further.

A quick example :

\> Module_A

\> Module_B

\> Module_C

Module_A when expanded can display whats underneath :

\>Module_A1

\>Module_A2 ...

Module_A1 when expanded can have more information underneath :

\>Module_A1_a1

\>Module_A1_a2

Module_A2 when expanded can have more information underneath :

\>Module_A2_a1

\>Module_A2_a2

Similarly Module_B and Module_C can have such information too.

So I want to know whether I can put in some format that is needed by confluence to display above data . I can generate on the unix side using python or perl or whatever language I find comfortable with.

So I want to know whether this is doable or not ?

I found code block macro as well which i thought can be used but it looks like its just for displaying bare code in confluence. It does not translate to a specific data format I need. Correct me if i am wrong.


Answers:
author: Brant Schroeder
body: [@varun parmar](/t5/user/viewprofilepage/user-id/5243643) you would need to use the Conflunce API to create the pages and the hierarchy.
Why do users get notified via email when a new subpage of a view restricted Page is created?
Asked by Volker Heubel:

Dear colleagues,

does anyone experience the same?

Users who are watching an entire space are getting email-notification on the creation of new pages/meeting notes even though they should't see those pages.

The pages are sub-pages of view-restricted Pages. The users are not allowed to view the Pages, yet the complete content of the newly created page is emailed to the watchers.

This is a no-go due to the sensitivity of the content.

We expected that no one recieves email-notifications about pages they shouldn't see!

We are using confluence 7.19.8


Answers:
author: Summer Hogan
body: Hi [@Volker Heubel](/t5/user/viewprofilepage/user-id/5128792) - welcome to the community!

It looks like a bug was closed as resolved by Atlassian for this exact thing here: <https://jira.atlassian.com/browse/CONFSERVER-35478> , but some are still experiencing the issue. There is a workaround to remove the watchers from the restricted page, which is not ideal if you have a large amount of users watching the page but it might work to resolve your issue.

This article might also help: <https://confluence.atlassian.com/doc/page-restrictions-139414.html>

comments: author: Volker Heubel
body: Hi [@Summer Hogan](/t5/user/viewprofilepage/user-id/4193903) thank you for your answer!

(We already found the issue you mentioned.)

In our case it is the users watching the entire space who get the notification via email.

So, removing all watchers from all spaces is not feasible. We do have +100 Spaces and 10000 Licences.

Cheers,

Volker


author: Volker Heubel
body: Hi [@Summer Hogan](/t5/user/viewprofilepage/user-id/4193903) , we contacted atlassian.

There seems to be a problem with inheriting view restrictions when using page templates.

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

As a migitation we disabled the module *page-created-notification* within the confluence content notifications plugin.  

<https://confluence.atlassian.com/confkb/cannot-enable-or-disable-bundled-system-apps-or-modules-1035241968.html>

Cheers,

Volker


author: Summer Hogan
body: Thanks for sharing this [@Volker Heubel](/t5/user/viewprofilepage/user-id/5128792)! If it comes up for another user I will now know. Can you please accept my answer?


Tags: bug

data-center

server
Can you hide the Admin Documentation public space that's provided when a user joins Confluence?
Asked by Najma Mohamed:

Hi All,

First and foremost, thank you for answering my question!

I am wondering if we can use global permissions based on User Groups to hide a public space Confluence provides when a user joins confluence:

* Admin Documentation(Knowledge-bases documentation)


Answers:
author: Deepak Jain
body: Hi [@Najma Mohamed](/t5/user/viewprofilepage/user-id/5222851) ,

You can change space permissions to restrict the space to certain users/groups. Here is the article about assigning space permissions on confluence:

<https://support.atlassian.com/confluence-cloud/docs/assign-space-permissions/>

Thanks !!


Tags: cloud

confluence-cloud
Why does the page tree view no longer display for existing spaces?
Asked by victoria_hansen:

In the last couple of weeks, the Tree view (Default) for Pages no longer appears for existing spaces.

The tree view has disappeared entirely for a couple of spaces and on one space it only shows one page and its sub pages.

However, for newly created spaces the tree view is present.

NO Tree in this existing space:

![image.png](https://mail.google.com/mail/u/0?ui=2&ik=0ce401474d&attid=0.1&permmsgid=msg-a:r-4995434405865664936&th=188b58ae22d83424&view=fimg&fur=ip&sz=s0-l75-ft&attbid=ANGjdJ9YIti8B4pAZ_oHDdkOtIby1-cIkAeQtmIG1kTNFBrCNcEE9HBFhUTzCPjB_he8hE09TejVU05BvuoW1-jyWrYLiedV2szulgBe8irb8cFicgBTZn5jo2Ozh54&disp=emb&realattid=ii_liuhivat1)

Only partial tree present in this space: There are plenty more pages and pages with subpages that should be appear.

![image.png](https://mail.google.com/mail/u/0?ui=2&ik=0ce401474d&attid=0.2&permmsgid=msg-a:r-4995434405865664936&th=188b58ae22d83424&view=fimg&fur=ip&sz=s0-l75-ft&attbid=ANGjdJ8xxYACaTLafvM6SDQAW7hbxVVQcnZj07xubR8ZvO7I2w3aQmYBFIbDF71WIAlfBJudJq4QkYP7bKsuiV0PO2UeeMyUtyjVmSzRylNKbke3K08hfOW0PS-dMZY&disp=emb&realattid=ii_liuhjnvc2)


Answers:
author: Deepak Jain
body: It looks as if you gave moved the home page of the space.

Can you please check, if there is the correct home page set in the space detail settings? This should be a tab next to the orphaned pages.

Try to set a new home page to fix the problem.


Tags: cloud

confluence-cloud
How can I add headlines (from table of contents) into children display?
Asked by danilany:

Hi dear community,

I have several pages in confluence.

Each of them has several sub-pages.

Each of those sub-pages, have headlines in them.

I'm using children display in the main page to show all the sub-pages.

I'm using table of contents in each sub-page to show the headlines.

I want the main upper page to show both sub pages + headlines but children display doesn't show this.

is there any way to show 'table of content' within the 'children display' ???

I found this online but didn't really find an answer to my question :\|

<https://community.atlassian.com/t5/Confluence-questions/Include-a-List-of-Child-Pages-in-a-Table-of-Contents/qaq-p/706555>

thanks in advance!

Dan


Answers:
author: danilany
body: So - i understand there is no solution? :\|


author: Summer Hogan
body: Hi [@danilany](/t5/user/viewprofilepage/user-id/5243490) - Welcome to the community!

Here is an article about the Children Display Macro which has a list of parameters in it that might be helpful to you. There is also some wiki markup that you can use to get what you want. <https://confluence.atlassian.com/doc/children-display-macro-139501.html>. I hope this helps!

comments: author: danilany
body: Hi many thanks but this is not what I'm looking for.

This simply shows how to use 'children display' which I already know / am using.

What I'm asking is how to combine 'children display' (of sub-pages) with 'table of contents' (of headlines in each sub-page)

thanks,

Dan


Tags: confluence-server

server
Why am I not in my personal space at login to Confluence?
Asked by Joni Graham:

In our Confluence Data Center instance, when a user with a personal space logs in, they are at a default page instead of the home page of their personal space. The user must click on the profile avatar and select **Personal space** to navigate to it. Is this working as designed? Is there anyway to navigate them directly to the space at login?


Answers:
author: Deepak Jain
body: Hi [@Joni Graham](/t5/user/viewprofilepage/user-id/4997241) ,

Thank you for writing in community.

You can choose to personalize your experience. and use an existing space home page as your landing page.

<https://confluence.atlassian.com/doc/choose-your-home-page-139452.html>

Hope this helps !!


author: Dan Breyen
body: Hi [@Joni Graham](/t5/user/viewprofilepage/user-id/4997241) based on this page [Home Page](https://confluence.atlassian.com/doc/choose-your-home-page-139452.html) , you can configure your Site Homepage to different spaces.

I don't have Confluence Server to test, and I don't know if it may be different in a newer version than what you have, but in the cloud, a Personal Space isn't a choice. I couldn't find a Jira issue on Atlassian's site (jira.atlassian.com). But you could always open a ticket at support.atlassian.com for clarification.

Hope that helps.


Tags: confluence-server

server
Updating 2+ UI Tabs simultaneously
Asked by Rich Imbrogno:

Hi. I've just discovered UI tabs and enjoy the layout and offerings. Question for the Hive. We ask our management team to post monthly highlights to a designated monthly tab. We also have a quarterly tab that, for the time being, I am copying the individual monthly tabs content and combining into a Quarterly view.

What I was hoping I could do is that when entries are made in the monthly tab, it would automatically update the quarterly tab. Is this possible?


Answers:
author: Zoriana Bogutska_Adaptavist_
body: Hi [@Rich Imbrogno](/t5/user/viewprofilepage/user-id/3047264) what app do you use for tabs?

You can try to embed the excerpt macro from the inside tab <https://support.atlassian.com/confluence-cloud/docs/insert-the-excerpt-macro/> but I'm not sure does vendor you use support that


Tags: confluence-server

server
Error when trying to subscribe to Statuspage
Asked by Thorn Tayloe:

Can someone help me to understand? I am trying to subscribe to Statuspage and don't know why i keep getting the following error -

We can't fulfil your request right now {#toc-hId--464047025}
------------------------------------------------------------

This product is temporarily unavailable for your site.


Answers:
author: Thorn Tayloe
body: Well - only one person responded and she was close to being correct (*thank you Barbara Szcresniak* ). It is not an "outage" as she suggested - it is a BUG in their system. I just received this information from the technical support team. **Figured this information may help someone else who is as frustrated as I am while waiting for resolve.**

*"The error message you are getting is related to a current bug that we have open: [CLOUD-11531](https://jira.atlassian.com/browse/CLOUD-11531)*

*This bug essentially prevents some customers from being able to provision Statsupage due to the new billing engine that Atlassian has implemented. While we don't have a fix yet, we do have a way to revert the billing engine to the old billing platform, which would allow you to add Statuspage.*

*In order for this to happen, I need to send this ticket to the customer advocate team."*


author: Barbara Szczesniak
body: [@Thorn Tayloe](/t5/user/viewprofilepage/user-id/1166994) There was a partial outage of Confluence Cloud on June 14 that has now been resolved. Please try again.

comments: author: Thorn Tayloe
body: Hi Barbara,

The issue still persists. I cannot access the tool. i get the exact same error.


Tags: cloud

confluence-cloud
make a professional home page
Asked by Mahsa Saraee:

Hi there,

I am trying to make home page so that everyone could see their avatar, some details about their profile and any recent news.

Is it possible? If yes, would you please let me know how to do it?


Answers:
author: Kishan Sharma
body: Hi [@Mahsa Saraee](/t5/user/viewprofilepage/user-id/5241742)

Using out of the box macros like User Profile, Recently Updated, Profile Picture macro you can create structured home page as per your requirement.

[Use the Recently Updated macro](https://support.atlassian.com/confluence-cloud/docs/insert-the-recently-updated-macro/) {#toc-hId--463392463}
----------------------------------------------------------------------------------------------------------------------------------------------

**To add the Recently Updated macro:**  
1. When editing, select from the toolbar

2. Find the macro by name and select it

3. Configure it as needed

[Use the User Profile macro](https://support.atlassian.com/confluence-cloud/docs/insert-the-user-profile-macro/) {#toc-hId-2024120370}
--------------------------------------------------------------------------------------------------------------------------------------

**To add the User Profile macro:**  
1. When editing, select from the toolbar

2. Find the macro by name and select it

3. Configure it as needed

Please also refer [Use macros to show Confluence content on pages](https://support.atlassian.com/confluence-cloud/docs/use-macros-to-show-confluence-content-on-pages/) to know what all macros you can use.

comments: author: Mahsa Saraee
body: Hi!

Thanks for your response. But this is not what I am looking for!

Let me explain more in detail...:

I know there is a macro named User Profile macro, however the problem is whoever is defined there has unlimited access to all profiles....this is extremely undesirable and unacceptable!

Is it possible for every single user to have his/her profile in private?

BestT

Mahsa


author: Mahsa Saraee
body: Hi [@Kishan Sharma](/t5/user/viewprofilepage/user-id/554991)

Thanks for your response, how ever it was not what I was looking for it!

Let me explain it more in detail...:

I know I have to use User Profile macro for this purpose. but the problem is whoever is defined there has full access to all profiles!! This is undesirable and unacceptable.

Is it possible for every single user gains access to their profile in private?

Best,

Mahsa.


Tags: cloud

confluence-cloud
Confluence REST API returns 403 Forbidden error
Asked by ????:

Hi. I have a question about Confluence's Rest API.

I've been using Google Apps Scripts to get information of confluence pages.

It worked fine until few days ago, but when I ran the script today, it started to return the error below:

```
Exception: Request failed for myurl returned code 403. Truncated server response: <html>
<head><title>403 Forbidden</title></head>
<body>
<center><h1>403 Forbidden</h1></center>
</body>
</html>
```

I haven't changed any code, and curl command works fine.

What are possible causes of this mysterious error?

My gas code to get confluence page is below:

```
function create_headers()

{

  return {

  'content-type' : 'application/json',

  'Authorization': 'Bearer ' + PropertiesService.getScriptProperties().getProperty("CONFLUENCE_TOKEN"),

   };

}

function getChildPages(page_id)
{
  var headers = create_headers();

  var options = {

  'headers' : headers,

  'method' : 'get',
  };

  var api_url = myurl + '/rest/api/content/' + page_id + '/child' + '?expand=page';
  var response = UrlFetchApp.fetch(api_url, options);
  var content_json = JSON.parse(response.getContentText('UTF-8'));
 
  return content_json["page"]["results"];
```

```
}?
```

I appreciate your help.


Answers:
author: Ken Wu _Miansheng_
body: I am also encountering this problem now with the same situation, I can use the Confluence REST API before but now it returns 403 error.

comments: author: Ken Wu _Miansheng_
body: Seems something is changed to the account.


author: ????
body: Hi. I finally solved this problem!

It was web application firewall(WAF) restrictions of Confluence Server(my company's infrastructure team solved it).


author: Ken Wu _Miansheng_
body: Such a good news!


Tags: confluence-server
Date macro is not working
Asked by Debabrata Sahu:

Page Date macro is not working in a particular page.


Answers:
author: Fabio Racobaldo _Herzum_
body: Hi [@Debabrata Sahu](/t5/user/viewprofilepage/user-id/1015584) ,

please could you provide more information about your issue? What appears on the related page?

Fabio


Tags: confluence-server

server
Need access to child page only
Asked by Aswathi D:

Hi

I have parent page with restrictions ,but i need to grant one user only to have access to the child page ( not to parent page )how can we manage that ?


Answers:
author: Diogo Teles
body: Hi [@Aswathi D](/t5/user/viewprofilepage/user-id/4742823) !

In Confluence, the child page inherits the restrictions from the parent page. If a user does not have permission to view a parent page, they also will not be able to view any of its child pages. It is impossible to restrict a user from a parent page but allow them access to a child page in Confluence's default permission system.

However, you can work around this issue in a few ways:

Move the child page to a different parent: If the information on the child page is not directly related to the parent page, you could move the child page to be under a different parent page that the specific user has access to.

Export the page using the Confluence export function (more options button on the top right) and send it to the user.

Avoid creating a second page in a different, unrestricted location with the same content. This will break a single source of truth for that content.

Also, if you are in this situation, it may be because either the child page should not be a child to that parent or your user may need to (organizationally) be included in different groups.


Tags: confluence-server

server