youngmon/atlassian-qna huggingface dataset:
Should the Master be the latest version? How do I ignore uncommitted changes?
Asked by Jeff Baumgart:

Hi,

It has been a while since using Sourcetree and I need to modify a program from 2 years ago. Below is how it was saved on Bitbucket. (The production program was generated from the Working copy).

I notice the Master is not at the top. Does this mean the latest was never committed/pushed up? If so, how can I correct this?

I want to modify the program using a new branch. Where do I need to branch from?

Is there a way to ignore the uncommitted changes (unnecessary compile generated files)?

Thanks,

Jeff

![Sourcetree.JPG](/t5/image/serverpage/image-id/33420i49D279402FAC1A30/image-size/large?v=v2&px=999 "Sourcetree.JPG")


Answers:
author: Mikael Sandberg
body: Hi Jeff,

Welcome to the Atlassian Community.

You are correct, your master branch does not have the latest that is in the RA431... branch, meaning it has not been merged into your master branch.

Where you branch off from is up to you, if you need the latest code you can either do it from RA431... branch, or you can wait until it has been merged into master and then branch off of master.

Yes, your unnecessary files can be ignored by using a [gitignore](https://git-scm.com/docs/gitignore) file. Note that the gitignore file does not affect files that are already in the repository.

comments: author: Jeff Baumgart
body: Thank you, I didn't realize the last branch never got merged. If I remember right, the Master needs to be checked out first before I can merge. Is that correct?


author: Mikael Sandberg
body: Correct, the target branch of the merge has to be checked out before the merge.


author: Jeff Baumgart
body: Thanks, I merged the branch OK but when I try to push it to origin I get this error:

![image.png](https://community.atlassian.com/t5/image/serverpage/image-id/33432i6C6CD3BFE03FB6F9/image-dimensions/690x130?v=v2 "image.png")


author: Mikael Sandberg
body: Can you access the repository via [Bitbucket](https://bitbucket.org/)? Atlassian did change the IP addresses for Bitbucket a couple of months ago, so if you are behind a firewall that may be the cause, have a look at the [blog post](https://bitbucket.org/blog/new-ip-addresses-bitbucket-cloud)about it. The only tech note about the error 403 from Bitbucket that I found was this [one](https://confluence.atlassian.com/bbkb/403-while-accessing-https-username-bitbucket-org-username-repo-slug-git-info-refs-321854562.html).


author: Jeff Baumgart
body: I saw the post. I don't seem to have access to Bitbucket. Is there any other way I can continue?


author: Mikael Sandberg
body: You can contact support [here](https://support.atlassian.com/contact/#/) and see if the repository is still active. If it is not you can always setup a new account in Bitbucket and import your local repository to it. While you wait you can still continue with your code changes.


author: Jeff Baumgart
body: My account had to be reactivated. It works now. Thanks for the help.
Connect to remote git repository
Asked by Omer Ozsakarya:

Hi,

How can I connect to remote git repository (not GitHub/Bitbucket) via Sourcetree?


Answers:
author: Prashant Mali
body: Hi [@Omer Ozsakarya](/t5/user/viewprofilepage/user-id/2035167) ,

Could you please try below KB article.

[https://confluence.atlassian.com/sourcetreekb/changing-remote-repository-path-on-sourcetree-using-git-or-mercurial-785616227.html](https://confluence.atlassian.com/sourcetreekb/changing-remote-repository-path-on-sourcetree-using-git-or-mercurial-785616227.html "https://confluence.atlassian.com/sourcetreekb/changing-remote-repository-path-on-sourcetree-using-git-or-mercurial-785616227.html")

Thanks,

Prashant
Cannot open Sourcetree
Asked by Jade Rope Team:

New here and not sure how to fix this, can someone please help.

Every time I start Sourcetree it always brings up the dialog that my user settings have become corrupt and must be repaired. Literally every time.

![](https://i.imgur.com/tjsVkc2.png)


Answers:
author: Ana Retamal
body: Hi, welcome to the Community!

In your case I'd follow the instructions at [wiping Sourcetree preferences](https://confluence.atlassian.com/sourcetreekb/how-to-wipe-sourcetree-preferences-412484640.html). Have you tried that already? Have you reinstalled the application?

Let us know how it goes!

Best regards,

Ana


Tags: windows
How to undo "Stop Tracking " on a file
Asked by Sesha Mamidala:

I have some xml file in my local which has some changes sourcetree put that file under pending files trying something i right-clicked on the file and clicked on "Stop Tracking" if someone could please advise on how i could put the file back to it's original pending tracking state (undo the stop-tracking) it would be of great help . I tried looking for discard option but i don't see it. this is the current state of file in red after stop-tracking \[!\[enter image description here\]\[1\]\]\[1\]

<br />

As per this link here <https://community.atlassian.com/t5/Sourcetree-questions/how-to-recovery-the-file-to-commit-after-stop-track-it-in/qaq-p/336993> we have to select "discard" option but i don't see that option on that file

![Screen Shot 2018-09-25 at 3.27.50 PM.png](/t5/image/serverpage/image-id/33265iA31E4CECE6AA70FA/image-size/large?v=v2&px=999 "Screen Shot 2018-09-25 at 3.27.50 PM.png")

These are the options i see when i right click on the file

![Screen Shot 2018-09-25 at 3.51.56 PM.png](/t5/image/serverpage/image-id/33266iD0EA3841A313EA1E/image-size/large?v=v2&px=999 "Screen Shot 2018-09-25 at 3.51.56 PM.png")

when i try to select "Log Selected " i get this error

![Screen Shot 2018-09-25 at 4.06.45 PM.png](/t5/image/serverpage/image-id/33268i6055560CCC03537A/image-size/large?v=v2&px=999 "Screen Shot 2018-09-25 at 4.06.45 PM.png")


Answers:
author: Manju
body: You can see the Discard file option by clicking on the "..." button next to the file name

![](blob:https://community.atlassian.com/dd33b5f6-453f-4574-a3b3-ade02d441425)

comments: author: Sesha Mamidala
body: [@Manju](/t5/user/viewprofilepage/user-id/222564) cool thanks !


Tags: mac
How do I uninstall Mercurial from SourceTree?
Asked by riturajshukla:

In my pull request there is indentation error. My code is not aligned properly in the pull request though it is fine in the text editor. I looked for help and got to know that uninstalling Mercurial will work. But I am lost after this.

Can someone tell how to proceed after this? I need the solution ASAP!

![Mercurial.JPG](/t5/image/serverpage/image-id/33243iF47ACE444FE05997/image-size/large?v=v2&px=999 "Mercurial.JPG")


Answers:
author: minnsey
body: There is no mechanism in the app to uninstall Mercurial, but you can close Sourcetree and then delete %localappdata%/Atlassian/Sourcetree/hg_local folder.  

Re-starting Sourcetree should prompt you about the missing Mercurial and one option will be to say you don't want to use Mercurial

comments: author: adhiamol
body: thanks it worked


Tags: bitbucket
Difficulty connecting to Bitbucket Server with Sourcetree
Asked by RS:

Bitbucket v5.1.1

SourceTree 2.7.6

When I try to add my Bitbucket project to SourceTree (or push to the project) I get this error:

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree push -v --tags --set-upstream ESL_PPF_Bitbucket refs/heads/master:refs/heads/master  
Pushing to <https://bitbucket.mydomain.com/projects/ESL/repos/esl-ppf/>  
fatal: unable to update url base from redirection:  
asked for: <https://bitbucket.rccl.com/projects/ESL/repos/esl-ppf/info/refs?service=git-receive-pack>  
redirect: <https://bitbucket.mydomain.com/plugins/servlet/samlsso?redirectTo=%2Fprojects%2FESL%2Frepos%2Fesl-ppf%2Finfo%2Frefs%3Fservice%3Dgit-receive-pack>  
Completed with errors, see above

Any ideas?


Answers:
author: Manju
body: Can you also check if push works from the command line?

If not, please check with your Bitbucket server admin if there is any change in the URL.
Sourcetree disabled xcode detecting SVN repo changes
Asked by hemangshah-in:

I have installed sourcetree app two days back since then my Xcode stopped detecting the changes of my SVN repository. It's able to detect changes from Bitbucket repo's but not SVN any more. This had happened only after I installed sourcetree app.

I have asked this question here as well:

<https://apple.stackexchange.com/questions/337476/xcode-stopped-detecting-svn-repository-changes-after-installing-other-version-co>

Please help me.


Answers:
author: Manju
body: If you are using Xcode 10, its basically an unsupported feature on Xcode and has nothing to do with Sourcetree.

comments: author: Manju
body: And my recommendation is to move your code from SVN to git with a bitbucket repo. You can find instructions to migrate here - <https://www.atlassian.com/git/tutorials/migrating-overview>


author: hemangshah-in
body: Hi [@Manju](/t5/user/viewprofilepage/user-id/222564), thanks you're right. I have found out the same from the question I asked on StackExchange.
pull and fetch
Asked by SCMTeam:

Hi team,

when we do a pull request from the source-tree, we normally could see the number of commits on the remote repo. the question I have is sometimes the changes are not present without "fetch". If I perform the pull without any number that indicates the commits and the were some recent changes to the remote repo. Does the pull actually getting all the most recent updates or not?


Answers:
author: minnsey
body: Hi  

The count of commits ahead/behind is done by a background call similar to  

    git log HEAD..remote/branch

It shoudl be refreshed in the background ever few minutes, depending on the settings in the Tools/Options/General tab, although is possible to get out of sync, something we are aware of. Ultimately closing the tab and re-opening should trigger a refresh.  

However these counts do not effect the pull/push as these simply UI indicators and not used in the git pull/push commands
Cannot get SourceTree to recognize existing local git repos.
Asked by Gerard Meszaros:

I have a folder F;\\Repos\\Git\\ that contains about 20 git repositories that I have used on previous computers with both SourceTree and Eclipse. I copied my F drive over to a new computer and I'm trying to set up SourceTree. I just want to tell SourceTree that all my local git repos are in F:\\Repos\\Git\\. I cannot find a way to do this. So I tried to bring in one of the repos (e.g. F:\\Repos\\Git\\TestRepo) but SourceTree tells me it isn't a valid Git or Mercurial repo.)

It shouldn't this hard to do something this basic. And no, I don't want to reclone each of the repos from the remote servers.


Answers:
author: Yogesh Mude
body: HI [@Gerard Meszaros](/t5/user/viewprofilepage/user-id/997912)

First, check your repo URL to which it is pointing ..using below command

$ git remote -v

If it is pointing to another/wrong location/repo then just change the URL in Source Tree please have a look at the below article..

<https://confluence.atlassian.com/sourcetreekb/changing-remote-repository-path-on-sourcetree-using-git-or-mercurial-785616227.html>

comments: author: Gerard Meszaros
body: I am truing to add local repos, not a remote repo. What does the remote URL have to do with this?
Filter Records in SQL Confluence based on VARCHAR or TEXT data
Asked by Dhiraj Kr_ Gupta:

I have a table Transformer which contains columns NAME, Owner and ID

Name Owner ID

Jack Yes 125

John Yes 162

Gray No 729

Shui No 625

Dhiraj Yes 728

When I am retrieve the records based on WHERE Owner = 'Yes' or 'No', it does not returning anything, or any thing based on Text or Varchar

But it is returning when I am retrieving based on ID., Then it is working fine

Please Help me !!!!!


Answers:
author: Stiltsoft support
body: Hi [@Dhiraj Kr_ Gupta](/t5/user/viewprofilepage/user-id/5375074) ,

The issue is in your WHERE clause, please try

WHERE 'Owner' LIKE "Yes"

comments: author: Dhiraj Kr_ Gupta
body: Thank You Very Much


author: Manne Kj?rby - ProProces
body: Hi Dhiraj.

I believe it should look like this:

'Owner' = "Yes"

comments: author: Dhiraj Kr_ Gupta
body: Thankyou Very Much


Tags: confluence-server

filter

server

table

table-filter

table-filter-and-charts

table-filter-charts-spreadsheets

table-transformer
User change cookie consent
Asked by Delali Kukah:

Hi there, I've just integrated Usercentric into my mobile app and I need help setting up a feature for users to adjust their cookie consent settings within the app. Once users accept the cookies, the dialogue box vanishes, and there's currently no option for them to modify their cookie consent afterward.

![image.png](/t5/image/serverpage/image-id/304619i49294DF7BC230531/image-size/large?v=v2&px=999 "image.png")


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

I think you are in the wrong place, your question does not seem to be about an Atlassian system. I suspect you have clicked on "help with the system in use for documentation or issue tracking" instead of "help with the product".


Tags: unknown-hosting-type
Design decisions
Asked by Alex Phipps:

I'm looking to create a design decisions log on confluence. Is there a way i can create a log on Confluence with similar functionalities to excel SharePoint? where i can filter Tabs etc


Answers:
author: Kristian Klima
body: Hi [@Alex Phipps](/t5/user/viewprofilepage/user-id/4459003)

If you're on Confluence Cloud, you can try Databases - it's a new Confluence feature and people are being creative with how they use it.


Tags: unknown-hosting-type
Give some advice about xml exporting and importing large Confluence spaces
Asked by Dimitar Dimitrov:

Hey Community,

I am in the process of migrating Confluence from one DC instance to another (as an interim step to migrating to Cloud later) and I amm doing this by export-xml, then local download of the export zip, then import from the 'restore' folder of the server.

However, I do have some very large spaces, ranging from 5GB to a 35GB.

With those I have noticed that first it takes forever to do the export, then I very often have issues in downloading the export zip. Sometimes I wait for hours and then the download still fails, which means I need to start over.

Do you have any good advice on how to deal with large confluence xml space exports, and more specifically with making sure I can download them locally?

Thanks in advance!

Dimitar


Answers:
author: Pavel Junek
body: Hi Dimitar,

Maybe a proxy in front of your Confluence like NGINX can cause a problem.  
I recommend the XML export directly from the server - it is located in \<onfluence-home\>/temp/, for example using WinSCP. Attention, the exported file is here for a maximum of 72 hours, after which it is automatically deleted.

Pavel

comments: author: Dimitar Dimitrov
body: Hm, interesting. I did not think of that option. Thanks Pavel, I will look it up and let you folks know how it goes.

Thanks!


author: Dimitar Dimitrov
body: [@Pavel Junek](/t5/user/viewprofilepage/user-id/387264) is the export always set to go to the \<confluence-home/temp\> folder?


author: Pavel Junek
body: Yes, in default yes. You can change this default setting - [How to change the location of space export files on Confluence](https://confluence.atlassian.com/confkb/how-to-change-the-location-of-space-export-files-on-confluence-1021230000.html)


author: Dimitar Dimitrov
body: Yes, I found it. Thank you!


Tags: confluence-server

migration-customer-care

server
Updating attachments in a workflow controlled space
Asked by Daniela Pbrand:

Hi,

I have several spaces where we control page creation and page updates with a Comala workflow. I have a space where users create pages with a Comala approval workflow, and the pages are automatically published to another space where the reader can consume the content. I know that attachments are separate entities, so they don't really count as a page update. Therefore, it seems I can't control attachment updates by users with Comala, meaning someone can unknowingly update an attachment and the published version won't be updated. That has to do with the fact that the Comala workflow only triggers when a page is actually updated.

Now I'm looking for a different solution, to have more control or at least insight into which attachments have been updated and when.

Any ideas will be highly appreciated!


Answers:
author: Kristian Klima
body: Hi [@Daniela Pbrand](/t5/user/viewprofilepage/user-id/5326257)

We're using Comala Publishing on top of the Comala Document Approval (light version of Workflow).

Our setup is that once the page in the Source space is approved, it syncs via [Comala Publishing](https://marketplace.atlassian.com/apps/143/comala-publishing?tab=overview&hosting=cloud) into the Target space.

Having said that, adding a label to a page, does not trigger the Approval status change but it DOES cause the publishing status do go out of sync.

Then we simply manually sync the pages (de facto triggering manual publishing) between the Source and the Target space.

Publishing app works great because it can be set up to sync ALL page's attributes and properties - including data from other apps (in our case K15t's Scroll Documents and Variants).

Give it a try, it may be solve your issue.

comments: author: Daniela Pbrand
body: Hi Kristian!

Thanks so much for your insights!! We have Comala publishing, but the page doesn't go out of synch when a user updates an attachment. So, the only other option would be to synch the page manually, but that gives little to no control over what has been updated. I didn?t know, though, that updating a label causes the page to go out of sync. I will experiment with that a little bit.


Tags: cloud

confluence-cloud
After Editing in Excel with Office Connector, Page Does Not Save
Asked by Seyyede Reyhane Khakshoori:

Hi.

We are using Confluence Data Center 8.7. After editing in excel with Office Connector then file does not save in Confluence and show this error.

![Screenshot.jpg](/t5/image/serverpage/image-id/304584i475AFED9C6744298/image-size/large?v=v2&px=999 "Screenshot.jpg")


Answers:
author: Rilwan Ahmed
body: Hi [@Seyyede Reyhane Khakshoori](/t5/user/viewprofilepage/user-id/5150819) ,

There 2 workarounds provided by Atlassian for this issue. Hope this helps

1. Select **Save a Copy**
   1. Save a copy to the location designated
   2. The file will be properly uploaded to Confluence with a new version
2. Select **Discard Changes**
   1. Any changes you've just made will be removed
   2. Make the desired changes again
   3. Save the file
   4. This time the file will be properly uploaded with a new version
   5. Note, the Office document will not close automatically after the upload in this scenario

Details in <https://jira.atlassian.com/browse/CONFSERVER-57721>

comments: author: Seyyede Reyhane Khakshoori
body: Thanks a lot.


Tags: questions-for-confluence

server
Documents uploaded into confluence are not visible
Asked by Mruthyunjaya_S_lycadigital_com:

Documents uploaded into confluence are not visible. In order to view the documents uploaded we have to go to the respective page and select the attachments. Cant we view all the documents attached to a page on accessing the page itself?


Answers:
author: Max Foerster - K15t
body: Hi [@Mruthyunjaya_S_lycadigital_com](/t5/user/viewprofilepage/user-id/1746425)

You can achieve this with the use of elements/macros. Simply give it a try, [Insert the attachments macro.](https://support.atlassian.com/confluence-cloud/docs/insert-the-attachments-macro/)

Best, Max


Tags: cloud

confluence-cloud
Confluence 7.13.7 API Request Returns HTML Instead of JSON
Asked by Goonawardanar_R_N_W:

In Confluence 7.13.7, my API calls are unexpectedly returning HTML content rather than JSON. I've checked my request headers and ensured `Accept: application/json` is included. Is there a known issue or configuration setting I might be missing that could cause this behavior?

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


Answers:
author: Dmitrii Zhukov
body: I have the same issue. Any updates?


author: Thomas Deiler
body: Dear [@Goonawardanar_R_N_W](/t5/user/viewprofilepage/user-id/5423376) ,

before you proceed, I strongly recommend to upgrade to at least 7.19.x.

Nevertheless have you tried to copy \& paste the REST GET call to a browser tab? Does it return also HTML instead of JSON?

Have you tried another REST client or browser extension?

Have you tried

```
https://example.com/rest/api/content/{id}
```

instead of

```
https://example.com/confluence/rest/api/content/{id}
```

<https://docs.atlassian.com/ConfluenceServer/rest/7.13.7/#api/content-getContent>

Cya

Thomas


Tags: unknown-hosting-type
A high-level roadmap/timeline
Asked by tamaraarekat:

Hello, I am trying to produce a high-level roadmap/timeline. Thus far I have used the roadmap macro but it's not very versatile in terms of colour. For example, I want to be able to change the colours in the same lane and add milestones etc. I want the simplicity of confluence so the team can easily change it every month but not the complexity of Jira. In need of grey colours too. Also, because our timelines are extensive, we need to scroll to the right to see the whole thing. Any way we can zoom out?

Do you recommend we use a specific plug in? Thank you!


Answers:
author: Pratibha Sunil Datir
body: Right click on respective EPIC timeline,color pallet will open.You can select required color to update for EPIC


Tags: cloud

confluence-cloud
Unexpected HTML Format Response from Confluence 7.13.7 API
Asked by Goonawardanar_R_N_W:

I am currently using Confluence version **7.13.7** and have encountered an issue when making API requests. Instead of receiving the expected JSON format, I am getting responses in HTML format. Has anyone else experienced this? What could be the cause, and how can I resolve it to receive JSON responses?


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

please could you provide more information about what api are you referring and how you use it?

Fabio


Tags: api

unknown-hosting-type
Not able to edit one particular draft page in Confluence
Asked by Vasanthakumar V:

Hi Team,

Getting below error when opening one particular draft version "editing is unavailable right now. try again in a few minutes". Any suggestions?

![edit issue.JPG](/t5/image/serverpage/image-id/304576i9B6FED1BA21AA77B/image-size/large?v=v2&px=999 "edit issue.JPG")


Answers:
author: lilachFeit
body: Hi did you manage to solve the problem ?

Unfortunately I am facing the same issue ....


author: Ankush Bora
body: I would imagine that error possibly to be intermittent. Can you confirm?  
Additionally, look for any access restrictions on that page.  
Let me know if you find any pointers.

comments: author: Vasanthakumar V
body: No its happening from last one week. No its a drafted page, restrictoins are not applied.


Tags: confluence-server

edit

server