youngmon/atlassian-qna huggingface dataset:
Add extra branch to Git Flow merges
Asked by Bert Oost:

We have a setupped branches like

* master -\> Production site
* develop -\> Development stable
* test -\> Test site

Also using Git Flow for our project(s). Which really is great to have.

The thing is; when you finish a feature/hotfix, it's being merged to develop and master, which is great. Only I am wondering if it's also possible to include our test branch here too?

Can I just add "test = test" to the git config or is this not going to work either?

Thanks in advance.


Answers:
author: Seth
body: If you are using gitflow, you should have 3 prefixes to work with: feature, hotfix, and release.

Feature should only merge to develop. Hotfix and Release should merge into both master and develop.

The point of "release" prefixed branches is to test. Instead of having a pre-defined permanent branch to deploy to your test site, I'd recommend deploying the current release/\* branch to the test site. When there are failures, commit the fixes to the release/\* branch. When the release is successfully validated, you finish it and it merges to develop and master.

comments: author: Bert Oost
body: Okay. We're working with Git Flow. We use the prefixes and we have a 'master', 'develop' and 'test' branch.

So; you're saying that a feature should be merged into 'test' manually (to test it) and when it's working, we should use Git Flows 'finish', which merges it into 'develop' and 'master'. And we should merge Hotfixes and Releases to test manually (to keep test up to date?)

Thanks for sharing your opinion.


author: Seth
body: You could do it that way, it would certainly work. However, my recommendation is to get rid of the permanent "test" branch, and INSTEAD deploy the current release or hotfix branch directly to your test site.


author: Bert Oost
body: So you say; just make a clone on the "test" environment and just switch to the right branch instead of merging into a 'test' branch.. And only finish a hotfix or new feature when it's working on that?


author: Seth
body: That is the design philosophy of git flow: <http://nvie.com/posts/a-successful-git-branching-model/>


author: Bert Oost
body: Make sense (of course hehe).. Realy thanks for your opinion and time here. Appreciate it!


Tags: git-flow
Add working copy and SourceTree wipes the .git folder
Asked by jeffmagill:

I just updated to v2.0.2 so maybe I'm just misunderstanding something. I cloned a git repo using terminal. Afterwards, I decided I wanted to work in SourceTree instead so I clicked \`\[ + New Repository \]\` \> \`Add existing local repository\`, found the directory and clicked ok. The repo appears in the repo list and I open it.

There is nothing there! Nothing under any of the views. Nothing when I switch to view the full branch. I try to pull but it doesn't find any remotes or branches. No history, but when I switch to the history view, I get,

\> 'git log' failed with code 128:'fatal: bad revision 'master'

So I go back to terminal and type \`git branch\` and there are none! All my files are intact but otherwise, it looks like this is either a brand new repo, or, perhaps, a corrupted one.

I have reproduced this several times using different repositories with different remotes. Am I doing something wrong or did I stumble on a bug?


Answers:
author: Seth
body: Is SourceTree set up to use "embedded" or "system" git? If it is using "embedded", but you initially cloned the repo with a newer version of git, there may be properties about the repository that causes SourceTree's older, embedded version to panic.

comments: author: jeffmagill
body: Yes. That was it. Actually, my system Git was behind at 1.7 while ST was using 1.8. This appears to have done the trick. Thanks a million!


Tags: mac
Error on pull
Asked by RenoMeyer:

Hey all,

I have trouble getting rid of the following errors whenever I want to make a pull. This suddenly started and I am not conscious that I would do anything different than before. Thank you for your kind help, I'm rather new to this...

git -c diff.mnemonicprefix=false -c core.quotepath=false fetch origin

git -c diff.mnemonicprefix=false -c core.quotepath=false pull origin master

0 \[main\] us 0 init_cheap: VirtualAlloc pointer is null, Win32 error 487

AllocationBase 0x0, BaseAddress 0x68560000, RegionSize 0x60000, State 0x10000

C:\\Users\\Reno\\AppData\\Local\\Atlassian\\SourceTree\\git_local\\bin\\sh.exe: \*\*\* Couldn't reserve space for cygwin's heap, Win32 error 0

Completed with errors, see above.


Answers:
author: Seth
body: Did you try rebooting?


author: RenoMeyer
body: Haha, thanks for solving my problem (and making me feel embarrassed at the same time :wink:)!!!

comments: author: Bal?zs Szakm?ry
body: Rebooting is a pain, I do it only once every two weeks after Windows updates. :)


author: vastagricsi
body: For me it was too painful to reboot in a certain moment; i tried pulling from console (terminal button on toolbar didn't work, but simple cmd did the job); navigating to the project root folder, than execute 'git pull' command. It was working.
I did a pull while I had local changes I'd made in Sublime that were not committed. How do I get these back?
Asked by KAZ Vorpal:

Using SourceTree and Git, I did a pull while I had local changes I'd made in Sublime that were not committed. I thought that the changes would merge down into my local version, but mine appears to have been wiped out.

How do I get it back?

<br />


Answers:
author: Bal?zs Szakm?ry
body: The changes you pulled got auto-merged into the files in your working copy. Your changes and the pulled changes should both be there in the files. (If there is any kind of conflict, pull fails and tells you to commit first.)

(All this above is only true if you are using an up-to-date version of Git. If not and your changes are gone, they are gone and there is no way of getting them back.)

comments: author: KAZ Vorpal
body: Could this be a factor:The file was new to the repository. Essentially, I took layout.css and made a new file called layout.less, because we're adopting LESS for managing their styles. I also emailed the layout.less to the client. He added it to the Git repository. I continued making changes on my local version. Then, when I did the update, it did NOT warn me the way I expected, it simply wiped out my local, newer version.Could this be because my local version was a non-entity, as far as Sourcetree/Git was concerned?In other words, I had never directly added it to Git, but I had it in that directory. The client added it to Git in the same directory. When I did the pull, as far as Git was concerned my local machine didn't HAVE a copy, officially. So it overwrote mine?


author: Bal?zs Szakm?ry
body: Yes, probably something like this happened. Anyway, next time, either stash or commit all your changes before pulling/merging... You might want to take a look at your recycle bin, perhaps it has the deleted file.
Image is not visible on confluence.
Asked by Manoj:

Hi Community,

I have created confluence page and uploaded image under heading serial number won't the image is not visible post publish.

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


Answers:
author: Craig Nodwell
body: Hi [@Manoj](/t5/user/viewprofilepage/user-id/1230517) if you click on the 3 dots top right corner of the page does it show the attachment as being present on the page? it'll show a menu item Attachments(x) x being the number of attachments on the page, if that is 0 then the attachment is not there, otherwise click on the link and inspect the attachments that are there.


Tags: confluence-server

server
Launch Knowledge Base main page from our Web Application using API
Asked by Mohan M A:

Hello Support Team,

We are currently exploring the use of Atlassian Confluence to set up our Product Knowledge Base.

Here's our specific requirement:

Our web application is hosted on Azure, and we want our customers to access the Knowledge Base in Confluence securely by clicking on the Help link within the application. During the redirection process, we need a secure authentication mechanism such as basic auth, API Auth, or any other appropriate method. Importantly, this authentication should be seamless, allowing our users to access the Knowledge Base without having to enter separate usernames and passwords.

We would appreciate your guidance on implementing this secure authentication process for our Knowledge Base.

Thank you for your assistance.


Answers:
author: Aron Gombas _Midori_
body: I don't think you can use an API key to authenticate into the Confluence web interface. An API key can authenticate REST API calls.

Another idea that comes to my mind is that you could research if exporting the Confluence content to a static website with the [Scroll Viewport](https://marketplace.atlassian.com/apps/1211636/scroll-viewport-for-confluence?hosting=cloud&tab=overview) app could help with this use case? I mean Viewport is based on export tempates, and maybe you could roll out your own authentication somehow...


author: Mohan M A
body: Hi [@Aron Gombas _Midori_](/t5/user/viewprofilepage/user-id/502447) ,

Thanks for your response.

But I our application is not an Identity Provider, So from our application we can't able to make SSO.

Could you please let me know is below scenario is possible from our application to Confluence Knowledge Base.

1. Create an API key in Knowledge Base(Confluence).

2. Configure that API key in our application.

3. Whenever our customer click the Help link, we will redirect to Confluence page along with API Key.

4. At the time of launching the Confluence site, is it possible to validate and authenticate a API and launch the main dashboard.

Please let me know if is possible above steps? If possible please share the documentation.


author: Aron Gombas _Midori_
body: Because you want the user authenticate, you obviously need to use a SSO integrated with the Atlassian Platform.

I think the right way to do this if your web application integrates with the SSO implemented by Atlassian Access: <https://support.atlassian.com/security-and-access-policies/docs/configure-saml-single-sign-on-with-an-identity-provider/>


Tags: cloud

confluence-cloud
Versionamento
Asked by Wanderson Carlos Eufrasio:

Como funciona o controle de versionamento das documenta??es no Confluence Cloud?  
Exemplo: Documenta??es de uma vers?o ainda em desenvolvimento que, portanto, n?o deve ser publicada no momento.   

How does documentation versioning work in Confluence Cloud?  
Example: Documentation of a version still under development which, therefore, should not be published at the moment.


Answers:
author: Brant Schroeder
body: [@Wanderson Carlos Eufrasio](/t5/user/viewprofilepage/user-id/4930726) This should help you out <https://support.atlassian.com/confluence-cloud/docs/create-edit-and-publish-a-page/#Create,edit,andpublish-Pageversionsandhistorypage_history>

comments: author: Brant Schroeder
body: [@Wanderson Carlos Eufrasio](/t5/user/viewprofilepage/user-id/4930726) can you mark this as accepted to help others?
How to restore table lines/structure in confluence table
Asked by samir:

Hello,

I have a table in confluence however part way down the table it appears that the table lines/structure have disappeared. I cannot also add data into the areas where the table lines have disappeared so its not just a visual thing.

Does anyone have any suggestions as to what can be done about this or what may have caused this?

Please see below sample screenshot of the table with missing table lines :

![Screenshot 2023-07-26 102635.png](/t5/image/serverpage/image-id/271229iF59A9C12109917E6/image-size/large?v=v2&px=999 "Screenshot 2023-07-26 102635.png")


Answers:
author: Max Foerster - K15t
body: Hey [@samir](/t5/user/viewprofilepage/user-id/5277221), welcome to the community!

This is a behavior I've seen a lot in the past in Confluence, and it's frustrating. I remember this happened a lot when copying and pasting content or tables (and cells). Merged cells seem to make it worse. Tables have been suffering from bugs, especially on Server/DC. I don't know a way to fix this quickly. Are new columns and rows added properly? If not, maybe go back to an earlier page version and "restore" your table with the help of the earlier content.

Best, Max

comments: author: samir
body: Thanks for the help [@Max Foerster - K15t](/t5/user/viewprofilepage/user-id/693014) . I guess it was caused by copy and pastes.

I solved by adding rows after sections that already had proper table lines. Then using the copy/paste options to copy the rows without the table lines into the added rows section.


Tags: confluence-server

server
How to convert a diagram which is in pdf format to drawio format?
Asked by sonam sharma:

I draw 3-4 diagram in draw.io but exported in pdf format. Now I don't have access to those files. So, is there any way to convert pdf to drawio format? I tried online converter tool but after that diagram is not coming in editable format. Pls suggest me something. Thanks in advance.


Answers:
author: Charlie Misonne
body: PDF is a file type that is meant to save documents by keeping the format. It is useful to print/ transfer files.

PDFs can generally not be edited or converted back to the orginal format. Yes, there are some conversion tools but the possibilities are quite limited because PDFs are not meant to do that.

I'm afraid converting PDF to draw.io is not possible. You will have to recreate you drawning.

comments: author: sonam sharma
body: Okay, Thank you so much.


Tags: cloud

confluence-cloud
Confiforms: How to use queryAndSet to pass data to smart multi-select fields?
Asked by Maniumek:

Hi, I checked the documentation of virtual function queryAndSet, but it is not explanatory enough for me to successfuly.  

I want to use this function inside confiforms integration rule to get the values a from 'X' column (smart dropdown type \[values are from 'dynamic dictionary' form\]) into the smart multi-select field that is part of a row from another form 'Y'. I specify to which row data should be passed by additional column in form X' with id of row form 'Y'.

How to work with queryAndSet in this context?  

[@Alex Medved _ConfiForms_](/t5/user/viewprofilepage/user-id/781630)


Answers:
author: Alex Medved _ConfiForms_
body: Hi

Hardly follow your X and Y forms references, but here is how you can use the *queryAndSet* function to set the values for the multi-select smart dropdown

<http://recordit.co/KWArl8OEwa>

Obviously the similar approach can be used from within ConfiForms IFTTT rules

Alex

comments: author: Maniumek
body: Thank you \<3, something like that could be placed in docs as an explanatory demo. :)


Tags: confiforms

confluence-server

server
All Inline Links are Broken with Can't Find Link Message
Asked by Michael Hoffman:

This evening, all of the links to Confluence pages in my organization started showing "Can't find link". Its rendered all the links useless without inline text. This is a massive issue and its happening across two organizations. Nothing has changed in both organizations and I've been following this same approach for links for months. I really hope someone can tell me how to fix this or open a bug for an immediate fix. Its essentially rendered Confluence useless.

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


Answers:
author: Brant Schroeder
body: [@Michael Hoffman](/t5/user/viewprofilepage/user-id/5001983) Are you still having this issue? Did you submit a support issue to Atlassian <https://support.atlassian.com/contact/>


Tags: cloud

confluence-cloud
'Can't Find Link' at the end of URLS to other Confluence pages
Asked by Napoleon Miller:

I have copied/pasted the URL of other confluence pages I have written in the body of my confluence pages.   

Today, all of the '[Smart Links](https://community.atlassian.com/t5/Confluence-articles/Smart-Links-a-richer-way-to-hyperlink/ba-p/1412786)' have broken, show the URL, and end with 'Can't Find Link'.  

The URLS are correct and still open to the right page. This is happening to old pages and new pages.   

Any ideas? This is only happening to URLS to other confluence pages.


Answers:
author: Michael Hoffman
body: Seems like a bug introduced by Confluence. Interestingly, if you do a ctrl-refresh of the browser page, the links work, but then they break again next time you navigate to the page.

comments: author: Napoleon Miller
body: It looks like it was indeed a bug! Thank you for letting me know you were experiencing the same.  

Looks all fixed now.


Tags: cloud

confluence-cloud
How to fill the selected text with a certain parameter in the macro creation page when editing a pag
Asked by ??:

Hi guys,as described in the title, can this effect be achieved?


Answers:
author: Brant Schroeder
body: [@??](/t5/user/viewprofilepage/user-id/5276310) Welcome to the Atlassian community

Are you creating a custom macro or a user macro?


Tags: confluence-server

server
How to Create a Personal Space on Behalf of Employee
Asked by Audrey Hernandez:

I see the info here <https://confluence.atlassian.com/conf714/create-your-personal-space-1087523990.html>

But is there a way to automatically create an employee's space once they are added from the HR system? We'd like our employees to automatically have a space created *for*them once they have Confluence access instead of having to go through the process of creating it on their own.


Answers:
author: Marc - Devoteam
body: Hi [@Audrey Hernandez](/t5/user/viewprofilepage/user-id/5276701)

Welcome to the community.

**No there is no option to automatically setup a personal spaces.**

Atlassian had this idea, for Confluence Cloud.

Due to overwhelming negative feedback from many Atlassian Experts and Administrators this ideas was put on hold.

Many of us feel that this clutters an environment and wold cause a lot of admin work, as this would entail that whenever someone leaves the company the personal space would need to be removed by and admin.

Personal Spaces should be created in the view of the Experts and Admins by users who want such a space to store own information or use it as a playground.

But off course it s just an opinion.

I hope this gives you some background.


Tags: unknown-hosting-type
How can I add a slack message to confluence cloud blog space from slack channel
Asked by Robert.Geritano:

I am trying to send a comment from various slack channels that I think are worth cataloging to a Jira confluence page.

I have integrated slack and set up my subscription to the confluence space. That allows me to receive updates from confluence to that slack channel.

I am trying to go the other way. Any ideas on how I can do that anyone?


Answers:
author: Evn Tomeny _Appfire_
body: Hi [@Robert.Geritano](/t5/user/viewprofilepage/user-id/5198907)

To my knowledge, while the native Confluence -\> Slack integration allows you to add comments from Slack, it doesn't allow you to create Confluence content from existing Slack messages.

You could try Appfire's solution, [Docs+](https://marketplace.atlassian.com/apps/1227656/docs-two-way-integration-for-slack-and-confluence?hosting=cloud&tab=overview). This is a two-way integration that not only allows you to set up subscriptions and receive Confluence notifications, but also allows you to select Slack content (individual messages or entire threads) and use it to create Confluence content.

Hope that helps!  
-Evn from Appfire


Tags: cloud

confluence-cloud
JQL show issues until a date
Asked by Ellie VanArkel:

Hey, new to this. I'm trying to use the JIRA macro to set up a bit of an automated schedule. I would like to tell it to show JIRA issues until a certain date, then after that date show different criteria.


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

you can use creation or update date into your JQL.

Fabio


Tags: confluence-server

filter

jql

server

table
How to customize "Page Not Found" and apply it to a single page or a space.
Asked by Ramesh Vadlamani:

Hello Team,

We wanted to customize the standard "Page Not Found" page with more information regarding page approval details like "Contact XYZ to submit a request or visit this site for more information".

We wanted to have this customization applied only to a page within a space.

Please let me know if this is possible.

We have "page restrictions" in place, but it's too generic, we wanted to add more details to this page.

Thanks,

Ramesh.


Answers:
author: Dan Breyen
body: Hi Ramesh, right now I'm not of aware of a way to change that, but I did find a suggestion that was submitted for Confluence Server, but it's been closed: [CONFSERVER-45408](https://jira.atlassian.com/browse/CONFSERVER-45408)

There is a corresponding Cloud ticket that you could vote for and watch [CONFCLOUD-45408](https://jira.atlassian.com/browse/CONFCLOUD-45408) if you're eventually going to migrate to the cloud.

Hope that helps.


Tags: confluence-server

server
I want to filter a confiform Table view that is inside of registration control for a separate form?
Asked by Evan Hiatt:

I have 2 coniform form definitions. One form has a field called "toolUses" that references the other form using a smart checkbox field. In the registration control form I want to use the users smart checkbox entry to the "toolUses" question to display more information about the entry from the second form that the "toolUses" field pulls data from. I think I want to display it in a table view.

Below is a picture of what I want it to look like if a user selects an option such as "calibrate models and simulations":

![Capture.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/271090iE3B26AC8FA653DE8/image-size/large?v=v2&px=999 "Capture.PNG")

I am doing this because I am trying to show the Use case description information without having to show all of them at the same time. I don't want to overwhelm the user. (If you have better suggestions, I am open to them)

Anyway,

Below is a picture of how I currently have this defined:

![Capture2.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/271091i5F72D3BFDA96B283/image-size/large?v=v2&px=999 "Capture2.PNG")

Where the TableView has this filter currently (I only do it like this as an example):

Filter is:

useCaseName.text:Calibrate Models and Simulations

![Capture3.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/271093i2B19D459CCC5989B/image-size/large?v=v2&px=999 "Capture3.PNG")

I have tried to replace the filter with this, but it displays nothing:

useCaseName.text:\[entry.toolUses.text\]

For context, here is the definition of the "useCaseName" Field defintion:

![Capture4.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/271095i360B1E4BE5C53F2A/image-size/large?v=v2&px=999 "Capture4.PNG")

Any suggestions would be great! I also have duplicate "Use Case Names" and I am not sure how to deal with those, but I am trying to solve one problem at a time.

Thanks


Answers:
author: Alex Medved _ConfiForms_
body: Hi [@Evan Hiatt](/t5/user/viewprofilepage/user-id/5238017)

TableView is rendered on page render and there is no such thing as "\[entry.toolUses.text\]"

As new records have no values in fields - there is nothing to filter on.

As for the duplicates - you probably have different records in the form that holds your "use cases" data. Separate records are presented separately - these are not duplicates, even if they share the same label text

Alex

comments: author: Evan Hiatt
body: Ah, bummer about TableView. I will try to figure out an alternative.

Thanks,

Evan


author: Dhiraj Kr_ Gupta
body: How to filter if there is hyperlink in the value


Tags: confiforms

confluence-server

server