youngmon/atlassian-qna huggingface dataset:
Creating a new branch in SourceTree
Asked by S Green:

Hello!

I created a new branch in SourceTree, committed my changes and then pushed to a remote.  
My question is: why doesn't the graph visually show the branch (diagonal line)? The new branch name does show under BRANCHES in left panel, but just not on the graph. The graph only shows a straight vertical line of nodes.

Here's what I did:

1 - under BRANCHES on left, I double-clicked "master" to check out the latest and use as my current working source.

2 - edited files

3 - hit the Branch button in top menu bar

* Current Branch: master

* New Branch: branch-blue

* hit "Pick"

* selected the top item in list (master)

* unchecked "checkout new branch"

4 - hit commit and entered message about changes

5 - hit push

* selected new branch name ("branch-blue") \& hit OK

After all this, SourceTree told me I was "one ahead" and the Push button still had a red indicator that I needed to push. So, I pushed again, this time selecting "master" as the branch to push. Only then where my changes pushed to remote. Why didn't selecting my new branch work?

If I'd successfully pushed onto my new branch, shouldn't I visually see that new branch in the graph?  
What did I need to do differently here to actually create and push on the new branch?

Where can I find documentation on the New Branch dialog (step 3 above)? For example, documentation on Working copy parent vs. pick (and what to pick)?

Thanks in advance!


Answers:
author: Seth
body: Since you unchecked "checkout new branch", you changes were committed to master, not the new branch.

The graph won't show a separate line for the branch until it has its own commit.

comments: author: Seth
body: Additional info about push - the push dialog doesn't push your latest commit to the selected branch, it pushes changes to your local copy of the branch to the remote copy of the branch.
Confused about accounts
Asked by Nathan Peters:

I feel like I have a billion logins for Atlassian services.

I have a Jira/Confluence which is separate from my HipChat and my new team uses Bitbucket vs my usual GitHub and that has yet another account. And then there is one other I had to create to "register" sourcetree (seriously?!) because none of my other Atlassian account logins worked. It is SUPER confusing.

I created a test repo to iron out any committing issues and I can clone the private repo I initialized through the browser but then I get permission issues when trying to push. I went to try and re-add my ssh key but it said "that key is already added by another user" when I am the only user. And if it is already there, what is the problem?

So what accounts are linked to what and where is there appropriate place to use them? On Github I had 1 account I used for myself and any private repos for whatever job I was on and it ALWAYS just worked.

```
Please make sure you have the correct access rightsand the repository exists.Pushing to git@bitbucket.org:[xxxxxx]/test.gitPermission denied (publickey).fatal: Could not read from remote repository.
```


Answers:
author: Nathan Peters
body: ### FINALLY {#toc-hId-1427878157}

<https://confluence.atlassian.com/display/Purchasing/Introducing+Atlassian+Account>


author: Nathan Peters
body: So it seems my issue is the same as this guy's: <https://answers.atlassian.com/questions/164023/password-not-working-on-sourcetree>My bitbucket credentials aren't working in sourcetree. I tried my id.atlassian credentials as well but those have no username (just an email) associated with them so sourcetree refuses to use them. I logged out of bitbucket in the browser and logged back in to verify my credentials so they do work -- just, not in sourcetree.


author: bmatichuk1
body: What would be great is if there was a personal login with a simple URL like

login.Atlassian.com

Then from here you could see all the companies you work with and all the products that each company has access to.

Then simply select where you want to go and click. Easy as pie.

Please!


author: Seth
body: Not sure how fair the GitHub comparison is, when it doesn't provide such a broad range of products...You may need to contact Atlassian support to answer this, if the answer is account related. I'm not sure how much control you (as a user) have over linking these accounts. Hopefully someone else can answer more confidently.


author: Nathan Peters
body: Oh and don't forget my new answers.atlassian account which uses the same email address as all my other accounts. I am really confused as to the reasoning behind all this separation.

answers.atlassian  
id.Atlassian personal  
id.Atlassian for company A  
bitbucket.org  
hipchat.com for company A  
hipchat.com for company B  
jira/confluence for company A  
jira/confluence for company B  

Those are all the accounts I can think of off the top of my head. Surely, there's a better way to handle this.


Tags: account

account-management
Is it possible to push a commit second time?
Asked by rouven_stross:

Hi,

is it possible to push a single commit a second time?

Thanks


Answers:
author: Tim Crall
body: I agree with Seth - this question doesn't make sense and suggests that there's maybe some confusion on your part as to what a commit is or what pushing means or something.


author: Seth
body: Not sure I understand. Push just copies commits to a remote. What would be the point of re-copying data that's already there?
Source Tree 1.6.21.0 Memory Leaking
Asked by James Dahms:

Hi,

I just updated Source Tree to 1.6.21.0 and left it on for approximately two hours. Not doing anything with it just left it open while checking the logs. The memory usage just went bananas. Peaked at 5.2gig before I had to force it down.

(tried to attach an image, but HTTP error)

I will keep it on again to see if I can reproduce it.

Regards,

James


Answers:
author: Timothy
body: Welcome to the club :\|

* <https://jira.atlassian.com/browse/SRCTREEWIN-2093>
Beyond Compare external merge tool won't start
Asked by EddieP:

Hi

The external diff works but the external merge does not. Below are my global .gitconfig settings. It worked once, but after that it stopped. When I select "Resolve Conflicts" -\> "Launch External Merge Tool" I get a popup saying "Visual Merge in Progress" with Filename and Repository listed and a button to select "Abort".

I also tried updating to the latest 1.6.21 version.

*\[difftool "sourcetree"\]*   
*cmd = 'D:/Program Files (x86)/Beyond Compare 4/BComp.exe' \\"$LOCAL\\" \\"$REMOTE\\"*   
*\[mergetool "sourcetree"\]*   
*cmd = 'D:/Program Files (x86)/Beyond Compare 4/BComp.exe' \\"$LOCAL\\" \\"$REMOTE\\" \\"$BASE\\" \\"$MERGED\\"*   
*trustExitCode = true*   
*\[core\]*   
*excludesfile = C:\\\\Users\\\\epatto.SONOSITE\\\\Documents\\\\gitignore_global.txt*   
*autocrlf = true*   
*\[http\]*   
*\[push\]*   
*default = current*

I also tried using "Resolve Using Theirs" and the popup says "Could not update one or more files, please check that no other application is locking your files". Then I started process explorer and it said no process is locking the file.

Then I noticed that the same file was in SourceTrees "Unstaged Files" list. I'm learning git. Why would the file be in the staged and unstaged area? When I clicked on the file in the unstaged area, it disappeared from both the staged and unstaged windows. Strange.

Many thanks for your help

Cheers

Eddie


Answers:
author: Johannes Kilian
body: You might have a [look here](https://jira.atlassian.com/browse/SRCTREEWIN-3543) - Atlassian has verified this as an error in current sourcetree

I have the same problem - what I know yet: I'm running git 2.5.2 on windows7. git uses several .gitconfig files: systemwide, global and per repository. If the settings you mentioned above are within systemwide or global .gitconfig, launching the external diff- or merge-tool fails - but if those settings are within the config-file of the repository (within the .git folder) it works: at least that's the solution which works here ...
error msg: key does not contain a section: trustexitcode
Asked by Pitterling:

Hi, on one of my pc i always get this error message when using sourcetree with git, like committing

"error: key does not contain a section: trustexitcode"

The task itself finishes successfully ... at the moment, i don't know where to check. Any advise?

thx, Peter


Answers:
author: Pitterling
body: Fixed it myself. My global gitconfig file was damaged and contained only half of the data.

comments: author: Shweta Kulshrestha
body: what you fixed please let us know me and my team member are also facing issue from today morning


author: Pitterling
body: Don't remember, but here is my (adjusted) gitconfig file:

\[user\]  
name = Lastname, Firstname  
email = email@abc.com  
\[difftool "sourcetree"\]  
cmd = '' \\"$LOCAL\\" \\"$REMOTE\\"  
\[mergetool "sourcetree"\]  
cmd = "'' "  
trustExitCode = true  
\[core\]  
editor = 'C:\\\\Users\\\\XXXXXXX\\\\AppData\\\\Local\\\\Programs\\\\Microsoft VS Code\\\\Code.exe' --wait


Tags: git

windows
Clone Unfuddle Git repository to Source Tree
Asked by Darshan Patil:

I have a git repository on my unfuddle account. How can I add/clone it in Source Tree?


Answers:
author: Seth
body: If you aren't using some form of Extended Integration (only available for a few hosts), cloning works the same regardless of the host.

<https://answers.atlassian.com/questions/58249>


Tags: git

unfuddle
How can I view new content of the branch against another in a Sourcetree?
Asked by Dmitriy:

Suppose, I have a **develop** branch and some **feature1** branch. And, suppose, that **develop** branch have some commits done after **feature1** was branched. How can I view new changes bringing with **feature1** for the **develop** branch in the [Sourcetree](http://sourcetreeapp.com)?

To be more precise is there a way to show diff like that command: "git diff develop...feature1"

Its a common operation for me when I analyze/review feature development using [feature branch workflow](https://www.atlassian.com/git/tutorials/comparing-workflows/feature-branch-workflow).


Answers:
author: Nirmal Shankar
body: This is a good thread that explains what you need

<https://answers.atlassian.com/questions/26552>


author: Dmitriy
body: Yeah)) Sorry, I correct my question. I'm trying to find GUI-tool which can do like this command. Sourcetree is the tool I preffer.


author: Nirmal Shankar
body: If I understand your question correctly, you are trying to find the diff between branches. git diff develop...feature1 does exactly the same :)
Browse merge tool
Asked by Stefan Karlsson:

I wanted to use WinMerge as a merge tool in ST.  
When i get to Tools \> Options \> Diff and selected WinMerge i got the ability to browse for the exe.  

I then remembered that i forgot to install WinMerge on my computer so i clicked cancel.  
Now when the merge tool is installed i am not able to get the browse window again.

How do i change the merge tool for ST manually?


Answers:
author: Seth
body: SourceTree stores that info in the git configuration. For me (Windows 10), it is in C:\\Users\\username\\.gitconfig

I would recommend having SourceTree shut down while editing that file.
Unable to view file contents in Windows
Asked by Anne H:

I'm following along a Lynda.com tutorial that is using SourceTree. The presenter is using the Mac version and I have the Windows version. I am using Windows 10.

The first issue I hit was I couldn't drag and drop the tutorial folder into SourceTree. So, I simply did **File \| Open** and pointed to the folder on my hard drive. The folder only has 1 file to start.

In the Lynda.com tutorial, the Mac version shows the contents of this text file. I don't see it on the lower right pane. The only way I can view this file is by double-clicking the file name from the lower left pane. However, that opens the file in Windows notepad.

I took a screen snap of how it look on the Lynda.com tutorial, but I can't get the image to insert either by dragging or uploading. The server is responding with a generic HTTP error


Answers:
author: Seth
body: To clarify, I think what you are talking about is the "diff" view. When you are adding a new file, the diff view will typically show every line as being added. You may have to single click on the file first. I have noticed a minor bug occasionally in Windows where the diff view will be blank. Try adding a second file, and then selecting the second file, then back to the first in SourceTree.


author: Anne H
body: I spoke with a friend via Skype and did a screen share. He said I should've been able to drag the folder over and the contents should show. I decided to delete what I had and start over. This time the folder opened and I could see the file contents. I'm not sure what caused the initial hiccough.


author: Anne H
body: I did commit the file. In the tutorial, he is able to see the contents before he even staged the file.


author: Seth
body: It'll be hard to help without the screenshot...Do you have "uncommitted changes" selected in the top pane?
Atlassian Intelligence for Mobile Apps
Asked by Jackie Stuart:

Is there a plan to make this available? And if so, roughly when, and can we join a waiting list?


Answers:
author: Simon Stiefel
body: Hi [@Jackie Stuart](/t5/user/viewprofilepage/user-id/4371789) ,

Thanks for the question!

AI for our mobile apps is something we're looking into but we don't have a timeline to share yet.

Thanks, Simon


author: Brant Schroeder
body: [@Jackie Stuart](/t5/user/viewprofilepage/user-id/4371789) I was not able to find anything stating when but I would assume some features will be released in mobile after it is out of beta.


Tags: cloud

confluence-cloud
Moving from subcategories to making in a main page
Asked by Keith Robben:

I have several documents that were created as a subcategory, but would like to put them on the main page content.

I've tried to move without success. Any suggestions?


Answers:
author: Dave Mathijs
body: Hi [@Keith Robben](/t5/user/viewprofilepage/user-id/5301203) welcome to the Atlassian Community!

When you talk about 'documents', do you mean Confluence pages or attachments on a page? Do you encounter an error? Are you able to provide a screenshot?

You can read more about page structure here: [Move, copy and hide pages](https://support.atlassian.com/confluence-cloud/docs/move-copy-and-hide-pages/)

comments: author: Keith Robben
body: [@Dave Mathijs](/t5/user/viewprofilepage/user-id/2662590)

The highlighted are the documents that I would like to move to the PAGES. They all need to be individual pages for content, and not built upon each other![Confluence screen shot.jpg](https://community.atlassian.com/t5/image/serverpage/image-id/277208i17E740FE1F6F8E1F/image-size/large?v=v2&px=999 "Confluence screen shot.jpg")


author: Keith Robben
body: [@Dave Mathijs](/t5/user/viewprofilepage/user-id/5246580) Disregard my issue...Instead I created Parent headings, then separated all my documents into each category. By doing that, I made my documents easier to locate and organize in specific headings.


Tags: cloud

confluence-cloud
Navitabs broken with code embeds
Asked by Seth Bertalotto:

Confluence Cloud Version: 1000.0.0-a00d4ebd227a

After creating my custom tabs in the Navitabs wizard, the preview and publish view of the tabs on my Confluence page shows the "\[object Object\], \[object Object\], \[object Object\]" strings.

This only happens when the contents of the tabs are code blocks with sample code. I have not seen this issue when not using code blocks in the tab content.

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

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

I've noticed that removing the type of language for the code block will then render it, but a bit buggy and without syntax highlighting or line numbers:

![Screenshot 2023-08-24 at 2.04.25 PM.png](https://community.atlassian.com/t5/image/serverpage/image-id/277043i4861DDC3C5FB46B9/image-size/large?v=v2&px=999 "Screenshot 2023-08-24 at 2.04.25 PM.png")


Answers:
author: Rodrigo
body: Hello [@Seth Bertalotto](/t5/user/viewprofilepage/user-id/5301170) and welcome to the Atlassian Community!

My name is Rodrigo, and I work with the team behind Navitabs.

We have received your message here and in our portal and are now working towards a fix to be released asap. We will keep you updated.

Thank you for your patience and understanding.

With friendly regards  
Rodrigo \& the bitvoodoo team

comments: author: Seth Bertalotto
body: [@Rodrigo](/t5/user/viewprofilepage/user-id/4988097) any updates?


author: Rodrigo
body: Good day [@Seth Bertalotto](/t5/user/viewprofilepage/user-id/5301170)

Thank you for the message,

Allow us to confirm that our team is on it and doing their best.

We have also replied on the support ticket. Let's continue communications there to avoid spam in the Community.

With friendly regards (and have a great day!)  
Rodrigo


author: Mattia _bitvoodoo ag_
body: Hello [@Seth Bertalotto](/t5/user/viewprofilepage/user-id/5301170)

As reported in the ticket of our help desk, a new version has been released that fixes this bug.

Best regards,

Mattia


Tags: cloud

confluence-cloud
Select Confluence Macros no Longer Updating
Asked by Rob Stone:

Exec Summary {#toc-hId--438187322}
----------------------------------

It appears that certain macros - including *(but perhaps not limited to)* the **Page Properties Report** and the **Recently Updated** macros - are no longer updating on my space in the cloud - it appears this issue started on 08/23/2023 @ 7:00 PM UTC. Before I jump down a rabbit hole, I was wondering if anyone has run into this before, or if it is related to an outage.

Steps to Recreate {#toc-hId-2049325511}
---------------------------------------

#### Recently Updated {#toc-hId-942935626}

(Below assumes you already have a page with the recently updated macro).

1. Create and update a new page of your choosing, and make/update an existing page.
2. Review a page with an existing recently updated macro - no changes after 8/23 @ 7:00 PM UTC are reflected.
3. Add a new recently updated macro onto a new or existing page, it will show no changes after 8/23.

#### Page Properties Report {#toc-hId--864518837}

1. Assuming you already have a page property report, note the records/selection criteria on said macro.
2. Add a new page and page property configuration and label the new page *(note, doesn't seem to matter whether you have a custom page property ID or not)* such that the new page should be picked up by the existing page property report.
3. Refresh your existing page property report - the new article will **not** be listed.
4. Create a new page property macro on a new page
5. Create a **new page property report** on a new page - when you first add the macro it will ***appear***that page property reports are being pulled, but as soon as you make a configuration update (ex. selecting a page label, parent page, etc.) it will show no content found.

*** ** * ** ***

It is extremely unusual to me that this is impacting both new and existing macros. Does anyone have any troubleshooting tips? Or is this perhaps related to the data lake issues reported on 8/24?


Answers:
author: Rob Stone
body: Closing this post - it seems like this was related to one of the outages between 8/23 and 8/24 in the Atlassian cloud platform. Macros are refreshing as expected as of this morning!


Tags: cloud

confluence-cloud

macro
Can I Simplify Confluence Page Transfers Beyond Manual XML Processes
Asked by Shuo Ping:

When using Confluence, we are currently utilizing the XML export-import method for space migration. However, this approach requires manual exporting from one space and manual uploading of XML files to another space, which consumes significant human effort and time. Is there a simpler way, preferably an automated one-click migration solution?  

We are aware that leveraging the API might help with migration, but it still involves a lot of manual setup. Are there any other alternatives available?


Answers:
author: marc -Collabello--Phase Locked-
body: Hi [@Shuo Ping](/t5/user/viewprofilepage/user-id/5208594) ,

Probably a paid app like [https://marketplace.atlassian.com/apps/1225377/space-sync-for-confluence-copy-publish-pages-over-sites?hosting=cloud\&tab=overview](https://marketplace.atlassian.com/apps/1225377/space-sync-for-confluence-copy-publish-pages-over-sites?hosting=cloud&tab=overview) is an alternative.


Tags: cloud

confluence-cloud
Search Results
Asked by Stacy LaBarbera:

I added a Live Search box into my page and would like better results to populate. All it gives is the space name/link, but doesn't take you to the specific heading or part of the page where that information is contained. Is anyone able to assist with getting better and more specific search results from a large page with lots of headings and content?


Answers:
author: Barbara Szczesniak
body: [@Stacy LaBarbera](/t5/user/viewprofilepage/user-id/5293223) Welcome to the Atlassian Community!

What have you selected for the **Search result format** parameter of the Live Search macro? You may have selected ++space name++ , instead of ++page excerpt++.

Refer to this page for details on all of the parameters for the macro: <https://support.atlassian.com/confluence-cloud/docs/insert-the-livesearch-macro/>


Tags: cloud

confluence-cloud
Limit the weekly calendar view to 8am to 5 pm
Asked by Daniel Widrich:

My weekly calendar view covers a wide daily time frame of +/- 17 hours.  

Is there any way I can limit this view to 8 am to 5 pm ?


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

There is not a way to do this at this time.


Tags: cloud

confluence-cloud
I am using the draw.io macro. I put a link in but when I went to use it the hyperlink it won?t work
Asked by John LeRoy:

When I click on the hyperlink it doesn't open up but, when I click anywhere else it wii. I also put in two more links but it won't take the URL associated with the link.


Answers:
author: Marija Radovic
body: Hi,

Could you please submit all the details to <https://drawio.atlassian.net/servicedesk/customer/portal/14/group/15/create/49>

Please attach the diagram if possible (it can be downloaded from page three dots top right \> Attachments), drawio and Confluence Server versions, browser version and OS.

Thanks,

Marija


Tags: confluence-server

server
Macros are referring which table in confluence
Asked by Petluri Babu:

Hi Community,

I found Plugin table but how to know the macro table which refer to plugin.

Thanks,

Sudheer


Answers:
author: Andrii Maliuta
body: Hello [@Petluri Babu](/t5/user/viewprofilepage/user-id/5279406) ,

Seems like some kind of a riddle :)

Could you please extend a little bit what is meant under plugin and macro tables?

Thanks

comments: author: Petluri Babu
body: Hi [@Andrii Maliuta](/t5/user/viewprofilepage/user-id/484201) ,

Thank you for quick response.

For example:

Plugin: Latex Math

Macros: mathline, mathblock, latex and unit.

Here plugin details will get from DB by using **select \* from plugindata**

but macro details in which table we will get it from DB.

Thanks,

Sudheer


author: Petluri Babu
body: And also please share migration steps from server to cloud with Phases method.


Tags: confluence-server

migration-customer-care

server