youngmon/atlassian-qna huggingface dataset:
Replace embedded git flow with AVH edition by petervanderdoes (Windows)
Asked by Paolo Furini:

I want to replace the nvie git-flow scripts embedded in SourceTree for windows, and use instead the AVH edition fork ([](https://github.com/petervanderdoes/gitflow)<https://github.com/petervanderdoes/gitflow>).

I know that you made changes to the original nvie code in the past, but I wonder if they are still required in the current win version.

If not, can u consider porting the option to use system git flow instead of embedded from mac version?

*In the meantime, is it possible to manually replace the embedded git flow with another one?*

**Note**: the AVH fork has diverged from nvie a lot, and the scripts are very different. So no backporting of custom nvie patches is possible, I suspect..

PS: I suggest to Atlassian guys to consider replacing nvie git flow with AVH as their embedded version. The AVH edition is growing faster, and bugs are resolved more quickly. Take for example this pull request that's waiting for 8 months, and that's already resolved in AVH edition: [](https://github.com/nvie/gitflow/pull/325)<https://github.com/nvie/gitflow/pull/325>(this is one of the reasons of my switch)


Answers:
author: Seth
body: There are feature requests [here](https://jira.atlassian.com/browse/SRCTREEWIN-1394) and [here](https://jira.atlassian.com/browse/SRCTREE-1762). Vote those up if you want to see this.

comments: author: jhagman
body: That was my original plan, but for some reason I was not able to log in to the Jira. I'll try again later and perhaps with a non-safari browser.


author: jhagman
body: They should really update the embedded git flow version, also on the Mac.


author: Seth
body: I second this suggestion. There have been no commits on nvie's repo since September 2012.


Tags: custom-field

git-flow

windows
Use a git running on a remote server
Asked by Christian Seidlitz:

Hi!

We have a mixed environment: our servers running linux with webserver in the backend and the comuters running our IDE as developers frontend.  
We are currently using a windows share on the linux system to work with the sources from the windows system. That - so far - works great.

The problem is, that git runs horrobly slow when executed on windows and scanning files over the share.

**It would be so great when we could just set up an ssh-connection to the server and execute the git commands directly on the target mashine.**

Is that maybe already possible, and if not, wouldnt it be quite easy to implement?

Regards,

Christian


Answers:
author: Christian Seidlitz
body: No it's not like that.

Normally every developer gets an own server. Normally ther is no risk of two people working on the same file.

Never the less it's not more or less risky than working with a file share is anyway.

Think of it as if the server is the linux part of the same single-user development system :)


author: Seth
body: It sounds like your source code is stored in a single location, and all developers modify it on that same location.

That is very risky. What happens if multiple developers are editing different parts of the same file at the same time? When the second one saves, it will overwrite the changes from the first.

Git is designed to solve this problem by hosting copies of the repository on each developer's machine. developers can make and commit changes locally, then merge in simultaneous changes made by other developers before pushing to the linux server.

comments: author: Christian Seidlitz
body: No it's not like that.

Normally every developer gets an own server. Ther is no (high) risk of two people working on the same file.

Never the less it's not more or less risky than working with a file share is anyway.

Think of it as if the server is the linux part of the same single-user development system :)
My SourceTree app will not authenticate Bitbucket account
Asked by Ian DeOrio:

So I run the setup wizard and when I try to connect to my Bitbucket account SourceTree kicks back that it cannot authenicate the account. I've tried changing my Bitbucket username and password and it still will not connect. Any fix for this?


Answers:
author: Seth
body: Open the terminal through SourceTree and ssh [bitbucket.org](http://bitbucket.org) to make sure the RSA key fingerprint gets added to your known hosts.


Tags: bitbucket-cloud

cloud

user
Can i limit the fetched commit history for large projects?
Asked by Christian Seidlitz:

Hi,

We are working with our source linked in with a share from our dev web-server.

When using SourceTree and load that "really big" project it takes ages for each operation.  
Is there a way i can limit the loaded data? So that e.g. i can limit the nr. of items in the commit history to 50 and only fetch the rest when i really need it?

Regards,

Christian


Answers:
author: dandob
body: Hi Christian,did you get an answer for your described 'issue'?Unfortunately I have the same performance issues for large git projects.Thanks in advance and best,Daniel

comments: author: hriziya
body: do you guys get any solution for this problem ? I am still having issue with this as of 9/28/2017 on sourcetree version 2.3.1.0 on windows 10


author: auto-admin
body: Got answer [here...](https://community.atlassian.com/t5/Sourcetree-questions/Speeding-up-quot-Fetching-older-commits-quot/qaq-p/587217)
How to recover from bad merge
Asked by Kevin Ivey:

I am using SourceTree to manage a BitBucket Git repository. I did a merge a couple weeks ago, but I must have goofed it up. I do not see any of the changes from the merged branch in master. When I try to merge the branch again, no changes are getting merged. I have made multiple commits in the master branch since this merge. How can I redo this merge without losing the work done in the subsequent commits.


Answers:
author: Seth
body: You might try creating a branch off of master on the commit prior to the original (faulty) merge, then merge from your other branch into this new one, and see what that branch looks like after the merge.


author: Kevin Ivey
body: None of the subsequent commits refer the files that should have been merged. What is also odd is that the commit created by the merge does not include any of the files that I would expect to find.


author: Seth
body: I'm not sure we can tell you how to fix it without a more specific idea of what went wrong. Did one of the subsequent commits somehow revert your changes?


Tags: cloud

git

merge
Push from sourcetree to bitbucket always as team
Asked by Toon Van de Putte:

We have a team on bitbucket called 'Klasse', currently with two members: myself and a colleague. I am the admin.

When I push from Source tree to the origin on bitbucket, this always seems to originate from the 'Klasse' team (the repository is owned by the team). When my colleague does a push, this is reflected correctly as coming from his individual account, and not from the team account.

I've spent all day looking at settings, resetting my ssh keys, restarting sourcetree, etc., to no avail.

Any ideas?


Answers:
author: Toon Van de Putte
body: I was under the impression that a repository only has one url: [git@bitbucket.org](mailto:git@bitbucket.org)*:accountname* /*reponame* .git (as mentioned [here](https://confluence.atlassian.com/display/BITBUCKET/Use+the+SSH+protocol+with+Bitbucket#UsetheSSHprotocolwithBitbucket-HowSSHandBitbucketworktogether))

When I change 'accountname' to my username, the push fails because the repository isn't found.

When I log in to bitbucket, I don't see the repository in my profile either. I \*am\* listed as a user with read, write and admin rights in the repository's access mgmt screen. The team 'klasse' is listed as the owner and my colleague is listed as the creator.

comments: author: KieranA
body: Hey Toon,

The account is the owner, which is the team, so the correct URL format would be the team name. Remember on Bitbucket that multiple people could have the same repo name within teams and of themselves, so there needs to be a per-user identifier. The 'ownership' of the repo is the team in this case.

Cheers


author: Toon Van de Putte
body: Yes, I realise there can be only one owner and a team repo only has one url. But how can I get my pushes to be associated with my account instead of the team account?


author: KieranA
body: Hey Toon,

I see what you want now. We don't support this in the user interface, but you can do this:

```
git config remote.origin.pushurl git@git.example.com:some/repo.git
```

So when you push it'll use a different URL to the one you're pulling from.

Hope that helps


author: Toon Van de Putte
body: Well, I \*do\* want to push updates to the repo on bitbucket, but from my own account instead of the team account.

My colleague seems to be able to do this, but I don't. No idea why, except for the url.


author: KieranA
body: Hey Toon,

Sorry, I'm being stupid (and wasting your time!). Your public key (\~/.ssh/id_rsa.pub) being used is for your team. If you do "cat \~/.ssh/id_rsa.pub" at the terminal you'll probably find that the e-mail address is that of the team.

I have the exact same setup, I'm part of a team on Bitbucket, and I use the SSH URL which contains only details of the team (not of me). It identifies me based on my public key.

Hope that helps


author: KieranA
body: Hey Toon,

Sounds like your repository URL is the team URL rather than an individual URL. Check that out to make sure it reflects your user.

Cheers
Running SourceTree on a closed Intranet
Asked by Lonny Gomes:

I love SourceTree and wanted to take load it a closed intranet. After 30 days, the software would not open because it couldn't connect to the internet to complete the registration process. Is SourceTree suported to run in such an environment?


Answers:
author: KieranA
body: Hey Lonny,

It can definitely run offline, but we do require a license to be registered to it after 30 days (we do this to find out how many users are using the product and as part of the EULA, that's all!). You can actually go on to [](https://my.atlassian.com)<https://my.atlassian.com>and create a SourceTree license which can then be imported into the product to do this. We have many users who run SourceTree offline in Intranet environments like yours, so this defintely works.

Cheers

comments: author: Lonny Gomes
body: Thank you for the quick reply! One other question would be is there a way to create the licenses in bulk or would every member of our team need to create them seperately?


author: KieranA
body: Hi Everyone,

Even though SourceTree is free, how it's used and distributed is governed by Atlassian's Customer Agreement. In the past users would have to generate a license and import the file into SourceTree in order to keep using the product. With Atlassian account, we're able to remove the licensing component, free trial, and protect SourceTree.

Current versions require a one time Atlassian Account login, or account creation during installation.

There is a current feature request for another option, and this request is actively monitored by our Product Manager: https://jira.atlassian.com/browse/SRCTREE-3452

Feel free to contact support directly at https://support.atlassian.com/servicedesk/customer/stsp if you have any questions.

Cheers!


author: Greg Allen
body: I can download my sourcetree.license, but on the latest version (2.2.2) of SourceTree there's no way to import it. My options at "Log in to your Atlassian account" include "Use an existing account" and "Go to My Atlassian". Both of these attempt to access the internet (which I can't). Is it still possible to run SourceTree without internet access?


author: Lionel Giordanengo
body: @Greg Allen : i agree with you, same behaviors on last version !!! Do you have found a wrokaround ?


author: Greg Allen
body: @Lionel Giordanengo I've reverted to 2.1, and I can still use my license offline.


author: toonetown
body: Just adding a "Me Too". I'd love to import the license for version 2.2.3...it was running just fine until I updated.


author: Heiko Gadow
body: +1 - for an ImportButton on start wizard


author: Greg Allen
body: <https://jira.atlassian.com/browse/SRCTREE-3452>

<https://support.atlassian.com/servicedesk/customer/portal/1/STSP-5603>
How to mobile IP allow
Asked by ???:

We are using the IP allowlist feature in Confluence. However, is there a way to allow access from mobile devices externally? Our company's sales team would like to configure access to the app from mobile devices while still using the IP allowlist feature. Is there a way to allow access only for mobile devices?


Answers:
author: Nic Brough -Adaptavist-
body: Welcome to the Atlassian Community!

You will need to whitelist the range of IP addresses that your mobile's providers use for the devices connected over their networks (which may well include other devices - I regularly use my laptop and desktop over a 4G, soon to be 5G, connection)


Tags: cloud

confluence-cloud
V8.3.1 Error when comparing versions with embedded macros (e.g. table of contents)
Asked by Barry Kavanagh:

After upgrading Confluence Server to 8.3.1 when ew compare versions of pages with embedded macros we get the error below.

### Cause {#toc-hId-2054949466}

Method "execute" failed for object com.atlassian.confluence.pages.actions.DiffPagesByVersionAction@6d632991

class org.outerj.daisy.diff.helper.CleanBrokenAttributeQNamesHandler (in unnamed module @0x6bfcdbc8) cannot access class com.sun.org.apache.xml.internal.utils.XML11Char (in module java.xml) because module java.xml does not export com.sun.org.apache.xml.internal.utils to unnamed module @0x6bfcdbc8


Answers:
author: Markus Kokott
body: After upgrading from 7.19 to 8.3 we got the same issue.

Also we got a warning for fontconfig.

We solved the problem using openjdk 11 (configured in setjre.sh).

Looks like confluence isn't compatible with it's built in jre...

comments: author: John Coffie
body: Thank you! I upgraded to 8.4.0 and using jdk11 solved my problem also.


author: Anh Phi NGUYEN
body: I upgraded to 8.4.0 and Open JDK 17.0.7 (I believe it goes the Confluence version) and still got the error. I am upgrading to 8.5.2 LTS and still have the same error. Any help could be appreciated.


author: Markus Kokott
body: I found a new setting in setenv.sh. Please check, if you have this setting:

```
# Add various JPMS arguments to allow Confluence to work on Java 17
CATALINA_OPTS="@$CATALINA_HOME/confluence/WEB-INF/jpms-args.txt ${CATALINA_OPTS}"
```

Our fault was, to reuse the old setenv.sh from Confluence 7 without this entry.

I didn't test java 17 with this option, but it sounds helpful.


author: Anh Phi NGUYEN
body: It works !!!. Thanks and appreciate for your help. I am using Data Centre for upgrading Confluence from 8.4.0 to version 8.5.2 LTS and Open JDK 17.0.7. I need to add another statements in setenv.sh to make it displays as below

CATALINA_OPTS=" --add-modules java.se --add-exports java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.management/sun.management=ALL-UNNAMED --add-opens jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.base/sun.util.calendar=ALL-UNNAMED ${CATALINA_OPTS}"  
CATALINA_OPTS="-Datlassian.recovery.password=Password ${CATALINA_OPTS}"  

Note: the second option is used with recovery_admin user and only modify before executing the command: sudo /usr/bin/systemctl start confluence and only on sandpit server for testing purpose.


author: Arkadiy
body: I get the same error when comparing ANY page with ANY version.

Confluence version 8.3.2

What's going on, how do I fix it?


Tags: confluence-server

server
How can i know that when the rate limit exceeds
Asked by Sunilkumar k:

Hello,

I want to know on when will the rate limit of jira rest api exceeds.

for example we have 10000 users using our app, how many requests can be made in 1 second or minute, how does this rate limiting exactly works ?

Thanks


Answers:
author: Aron Gombas _Midori_
body: What [@Ismael Jimoh](/t5/user/viewprofilepage/user-id/1214168) mentioned is valid for Jira, here is the corresponding Confluence developer documentation: <https://developer.atlassian.com/cloud/confluence/rate-limiting/>

**Theory:** As you will see, it will return HTTP response headers with hints.

**Reality:** In our experience, certain REST API end-points have no rate limits, they simply fail when overloaded. Therefore I wouldn't be surprised if you don't receive those header, but your request doesn't succeed with 200...

comments: author: David Bakkers
body: Hello [@Aron Gombas _Midori_](/t5/user/viewprofilepage/user-id/502447)

Are you able to advise of the specific Confluence endpoints that fail 'silently' and don't return a `429` response code if the rate limit is reached?

It's good coding practice to check for `500` series errors in responses, as they often indicate you've reached a *resource limit*, which can easily be mistaken as a 'failure':
> Some transient `5XX` errors are accompanied by a `Retry-After` header. For example, a `503` response may be returned when a resource limit is reached. While these are not rate limit responses, they can be handled with similar logic as outlined below.


author: Aron Gombas _Midori_
body: My latest memory is that the content property "write" can lead to problems if you bulk-write content properties to a large number of contents in a short time window.

The REST API end-point returns with success or maybe with sporadic errors, but the database powering Confluence may have difficulties with handling the load. The expectation would be that rate limiting rejects the requests if they are overwhelming Confluence. (Or, if the rate limiter doesn't reject them, then I would assume that they could be handled without any side-effect.)


author: Ismael Jimoh
body: Hi [@Sunilkumar k](/t5/user/viewprofilepage/user-id/4775218)

You can learn more about api limits here: <https://developer.atlassian.com/cloud/jira/platform/rate-limiting/>

I am hoping it answers your question.

comments: author: Sunilkumar k
body: Hi [@Ismael Jimoh](/t5/user/viewprofilepage/user-id/1214168) in the document it is mentioned that the "X-RateLimit-Limit ", will be there in the headers of the response, but could'nt see that, can you please help me by saying that from where i can get X-RateLimit .


author: Ismael Jimoh
body: This will be returned when you make your call. As mentioned in the document, if you get a 429 response, typically, you should see the x-ratelimit-limit.

Also note what [@Aron Gombas _Midori_](/t5/user/viewprofilepage/user-id/502447) mentioned. I haven't run into many issues where I exceeded this but if this isn't thrown all the time then it'll be hard to say.


Tags: cloud

jira-cloud

jira-software

rest-api

test
Expand Child Pages Tree Automatically When Opening Parent Page
Asked by Eric:

I personalized the sidebar by putting HTML code in the sidebar.

However, there is a difference from the existing sidebar, which means that the child page does not expand automatically when the parent page is pressed.

After all, you need more clicks to access your child's page.

Please tell me how to open the child page automatically when I access the parent page.


Answers:
author: Nic Brough -Adaptavist-
body: Welcome to the Atlassian Community!

You'll need to write javascript that can effectively "click expand" as the page loads. This is probably not a good idea - it's not easy to do, and it's not going to be reliable.

A better idea would be to write an app to present what you need - you can have full control over that.


Tags: server
Prevent jumping to the top of page when publishing
Asked by hpuc:

When I publish a page, the display always jumps to the top of the page, even if I was making changes at the end of the page. Is there any way to prevent that and to have the part of the page being displayed I was just working on after publishing?

Some data: I am using the "new" editor of Confluence Cloud on Windows (10 / 11 - same thing) and Chrome


Answers:
author: Nic Brough -Adaptavist-
body: Welcome to the Atlassian Community!

This is not a Confluence problem, it's the way browsers are intended to work. New page = start at the top.


author: Dave Mathijs
body: Hello [@hpuc](/t5/user/viewprofilepage/user-id/742555)

That's by design. When you publish a page, you're no longer editing it, so it starts at the top because it refreshes the page.


Tags: cloud

confluence-cloud
How to add specific column values in Confluence table
Asked by Vaibhav V:

Could anybody suggest me on how to add specific column values in Confluence table?, there are few columns in the confluence table that I have created and need to add them like similarly how we perform operations in excel...,


Answers:
author: Katerina Rudkovskaya [Stiltsoft]
body: Hi [@Vaibhav V](/t5/user/viewprofilepage/user-id/5115797),  

As for now, it is not possible to use Excel features (table calculations, totals' counting, merging, etc.) in Confluence, you'll need some additional apps from the Atlassian Marketplace to perform such tasks.  

We can suggest using the app that we develop -- [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).  
If you prefer to work with native Confluence tables, then the [Table Filter](https://docs.stiltsoft.com/tfac/cloud/how-to-use-table-filter-macro-42239756.html?utm_source=atl_community&utm_medium=answer&utm_campaign=table-filter-traffic-sources&utm_vendorID=1216111) or [Table Transformer](https://docs.stiltsoft.com/tfac/cloud/how-to-use-table-transformer-macro-42241552.html?utm_source=atl_community&utm_medium=answer&utm_campaign=table-filter-traffic-sources&utm_vendorID=1216111) macros will help you to count totals.  

If you need to work with fully functional spreadsheets containing all the basic Excel-like features, you may try the Table Spreadsheet macro.  

In case you are not familiar with the app, we'll be happy to arrange a live demo for you and your team -- please book a suitable time slot [here](https://calendly.com/tablefilter/live-demo?month=2023-06).


Tags: cloud

confluence-cloud

filter

ms-excel

table
Seeing weird CSS behavior when opening a new Jira document
Asked by Linda Zhou:

Hi,

I'm seeing wonky pages when opening up a Confluence document page or a creating a new document page. To resolve, I have to hard refresh 1 or 2 times before the page is normal.

Here's a screenshot of the latest behavior:

![Screenshot 2023-06-26 at 2.44.36 PM.png](/t5/image/serverpage/image-id/265138i8618B191B9AF585C/image-size/large?v=v2&px=999 "Screenshot 2023-06-26 at 2.44.36 PM.png")

Anyone else on the same boat?


Answers:
author: Brant Schroeder
body: [@Linda Zhou](/t5/user/viewprofilepage/user-id/5241558) I would suggest clearing your browsers cache. Have you tried that?


Tags: cloud

confluence-cloud
How to update the content/body of confluence homepage via API?
Asked by Paul Lam:

I called GET /rest/api/content/\<homepage-id\>, and looked at the api docs, nothing there seem to help a lot with updating the content of confluence homepage.

I tried the following as well: <https://community.atlassian.com/t5/Confluence-questions/Can-you-programmatically-create-a-banner-for-a-Confluence-space/qaq-p/2033185>, still no luck.

Is this achievable via API? If so, how is it done?


Answers:
author: Paul Lam
body: Figured out. I used GET /space/\<spaceID\>/content?expand=body.storage,version to get the HTML of the homepage, do some HTML parsing and modifications, then PUT /content/\<contentID\> to modify the homepage.

Lmk if there's a simpler way of modifying one section of the HomePage


Tags: cloud

confluence-cloud