youngmon/atlassian-qna huggingface dataset:
Why embedding an old Git in Sourcetree?
Asked by Antoine C?ur:

In latest Sourcetree (2.0.5.2) for mac, embedded Git is 2.2.1. I know we can use SYSTEM GIT, but why embedding an old Git in the first place?

OS X Git is:

git version 2.3.2 (Apple Git-55)

<br />

Brew Git is:

2.4.0 (<http://braumeister.org/search?search=git>)

Official Git is:

2.4.1 (<http://git-scm.com/downloads>)

You should at least match the OS X Git version, or auto-use the latest Git you can detect.


Answers:
author: Seth
body: "In the first place" - it WAS the latest when it was embedded. Since the UI is completely dependent on the git commands and responses, it is not a trivial thing to change which version of Git is embedded. As you said, you can do it yourself by using system git, but that comes with some risk that SourceTree won't be compatible.

comments: author: Antoine C?ur
body: OK.

But then, newer versions of Git were released:

* 2.2.2 on 13 Jan
* 2.3.0 on 6 Feb
* 2.3.1 on 25 Feb
* 2.3.2 on 7 Mar (Apple is using it for OS X Yosemite)
* 2.3.3 on 14 Mar
* 2.3.4 on 24 Mar
* 2.3.5 on 1 Apr
* 2.3.6 on 22 Apr
* 2.3.7 on 28 Apr
* 2.4.0 on 1 May
* 2.4.1 on 14 May

As SourceTree is a popular tool which first and main purpose is dealing with Git support, it should update more often to keep its value. As of now, SourceTree is 11 stable versions late, and I'm not counting in base 2.


author: Seth
body: Keep in mind that updating the embedded version of Git would require complete revalidation of every feature in the app that is for Git, which is time consuming and takes away from time spent fixing bugs or developing new feature.It would be more fair to count months instead of versions. Or if you really want to count versions, don't count the incremental versions. SourceTree is about 6 months behind, or two "minor" versions (whatever you want to call the second part of the version number).Also, Git itself hasn't updated the builds for Windows since version 1.9.5, which is a whole MAJOR version behind, and surely has a wider user base than all of SourceTree combined.
Why does not sourcetree support downloadprogress when clone a repository from github?
Asked by Hao Peng:

When I use command line, it has downloadprogress, which I believe is good.


Answers:
author: Bal?zs Szakm?ry
body: You can create a feature request for this at <http://jira.atlassian.com>. Put the link to the ticket in a comment here so that others can vote for it.
How do you resume a cherry pick
Asked by Mike Colls:

Using SourceTree I have just performed a cherry pick and I got a merge issue. I have used my merge tool to result the issue. I now have uncommited changes on the top of my current trunk. How do I resume and complete the cherrypick?


Answers:
author: Bal?zs Szakm?ry
body: Press the commit button to commit the merge results. The necessary files should already be staged for you.

comments: author: Joe Pallas
body: When I do this, the usual cherry pick commit message seems to get lost and I have a blank commit message. Not sure if I am doing something wrong.


author: Joe Pallas
body: Correct answer seems to be use the terminal to run `git cherry-pick --continue`. [SRCTREE-3133](https://jira.atlassian.com/browse/SRCTREE-3133) seems to cover this.
Disable automatic merge
Asked by Mayke Kloppenburg:

This is the situation:

We are working on a project with different branches. Whenever I pull from one branch, sourceTree automatically makes a commit with a branche merge. However, I do not want to merge the branches. The only way to get rid of it is resetting the commit in a command line. Last time sourcetree even managed to create a merge conflict, even though i did not change anything.

How do I disable this?


Answers:
author: Bal?zs Szakm?ry
body: In Tools\\Options\\Git, set these two the way they are on the screenshot:

image2015-5-12 14:39:54.png  
[](https://community.atlassian.com/t5/Sourcetree-questions/Disable-automatic-merge/qaq-p/158510?attachment-id=9772){#link_11740e13d23656}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/4697/1/image2015-5-12%2014%3A39%3A54.png){#display_11740e13d23656_0}

comments: author: Bal?zs Szakm?ry
body: You will still have to merge if your local unpushed changes conflict with the changes you are pulling.


author: Tim Crall
body: "Pull" inherently implies merge. I'm not quite sure what you're asking. If you are saying that you have branch_a and branch_b and branch_a is getting merged into branch_b when you do a pull, then you must be pulling from the branch that isn't checked out. Try checking out a branch before pulling that branch so that it pulls into the correct branch.  

comments: author: Bal?zs Szakm?ry
body: Pull with rebase does not do merge.
Cherry Picking on SourceTree?
Asked by Albert Cruz:

I've tried every instruction on Cherry Picking but I can't see that option when I right click on a SourceTree commit. Can someone give a real step-by-step guide instead of a vague "right click to Cherry Pick". I'm using Mercurial by the way.

Thanks


Answers:
author: Seth
body: I only use Git, but this is what it looks like. It shows up for me when right clicking any commit. It is visible but disabled when right clicking "Uncommitted changes".Capture.PNG  
[](https://community.atlassian.com/t5/Sourcetree-questions/Cherry-Picking-on-SourceTree/qaq-p/354284?attachment-id=10742){#link_116a522a89737b}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/10580/1/Capture.PNG){#display_116a522a89737b_0}

comments: author: Seth
body: In mercurial, it might be called "graft": <http://selenic.com/hg/help/graft>


author: Albert Cruz
body: thanks so much. I tried it but I still confused.i have branch a and branch b, I created a commit from branch b and changed a line of code. I then grafted the commit I did and the changes I made aren't reflected on branch a.


author: Seth
body: When you cherry-pick/graft a commit, a new commit will be created with the same changes on the branch that you have checked out. Did you checkout branch a before trying to cherry-pick the changes there?


author: Albert Cruz
body: thank so much. finally made the graft, turns out there was a problem with my sourcetree and didn't show the push/pulls to be done until i restarted it.Thanks again


Tags: mercurial
Cannot finish function in Gitflow
Asked by Luke 081515:

In cannot fiinish a function in Gitflow. The error says, that I have to initialise it first. But in the menu from Gitflow it is not possible to initialise. Can you help me with the console command? Thanks, Luke081515


Answers:
author: Seth
body: I believe it's git flow init

<https://github.com/nvie/gitflow/wiki/Command-Line-Arguments>


Tags: git-flow
Pruning Source Tree
Asked by Michael Cunningham:

I'd like to move the origin back to commit b13aa2c and then start branching from there. Instead after some test committs with new developers I (the project manager) ended up with this . Any guidance or point me to documentation for windows would be very much appreciated.  
[](https://community.atlassian.com/t5/Sourcetree-questions/Pruning-Source-Tree/qaq-p/241476?attachment-id=4123){#link_116a524efed516}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/7078/1/SourceTree.png){#display_116a524efed516_0}


Answers:
author: Seth
body: You don't need to have a particular commit checked out before you can branch from it. SourceTree will give you the option to check it out as part of creating the branch.


author: Bal?zs Szakm?ry
body: You should probably leave origin/master (the server's master) as it is.

To create the branch as you want it:

1. Stash your uncommitted changes
2. Right-click on the b13aa2c commit, select "Branch..." to create a branch from this point.
3. Apply your stash to get your uncommitted changes back into your workspace.


Tags: windows
GIT Error
Asked by Rama Bharti:

Hi ,

I am getting error with git while pulling. Here are the steps I have followed.

1. Pull latest code.
2. Merge my changes and commit.
3. Before I push, somebody made push in GIT.
4. I am trying to push and it says you need to pull first with latest copy.
5. I tried to pull and it gives error again.
6. I reverted my commit.
7. But I need to push reverse to GIT and it does not allow and get below error:-  

   = \[up to date\] post_patch2_merge -\> post_patch2_merge

   ! \[rejected\] Release2.2 -\> Release2.2 (non-fast-forward)

   error: failed to push some refs to 'w028@[git.com](http://git.sensis.com).[au:/app/git-repos/salesforce/newco.git](http://au/app/git-repos/salesforce/sensisnewco.git)'

   hint: Updates were rejected because the tip of your current branch is behind

   hint: its remote counterpart. Integrate the remote changes (e.g.

   hint: 'git pull ...') before pushing again.

   hint: See the 'Note about fast-forwards' in 'git push --help' for details.

   Completed with errors, see above
8. Trying to pull and get below erro:-
9. git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree fetch origin

   git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree pull --no-commit origin Release2.2

   You have not concluded your merge (MERGE_HEAD exists).

   Please, commit your changes before you can merge.

   Completed with errors, see above

Can you help please?


Answers:
author: sreekumar_menon
body: I think the problem is your pull failed to merge automatically and went to conflict state. And the conflict wasn't resolved properly before the next pull.

1) Undo the merge and pull again.

To undo a merge:

`git merge --abort`

2) Resolve the conflict.

**3) Don't forget to add and commit the merge.**

4) `git pull` now should work fine.

good luck!

comments: author: Rama Bharti
body: SreeKumar,

Can you please confirm if I need to do below step by UI

image2015-5-11 12:44:21.png

[](https://community.atlassian.com/t5/Sourcetree-questions/GIT-Error/qaq-p/60967?attachment-id=6334){#link_116a524c109174}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/1793/1/image2015-5-11%2012%3A44%3A21.png){#display_116a524c109174_0}  
[](https://community.atlassian.com/t5/Sourcetree-questions/GIT-Error/qaq-p/60967?attachment-id=6335){#link_116a524c109174_0}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/1793/2/image2015-5-11%2012%3A43%3A47.png){#display_116a524c109174_2}


author: Rama Bharti
body: Thanks for your response. I am on Mac and not using command line. How I can do using UI.


author: Seth
body: You should only do that if you've resolved all conflicts.


author: sreekumar_menon
body: Was this "resolved" ? You can resolve merge conflict in SourceTree UI too , using external tools .


author: Tim Crall
body: It looks like your actual question has been pretty well addressed, but your life will be easier if you and the other developers work on separate feature branches.
SourceTree File Status
Asked by matthewsohswg:

Is this a FAQ for the file statuses in SourceTree? I have a file that shows up in Staged as well as Unstaged, with the one in the latter with the "Clean" status. What does that mean?

I got here after doing a soft reset.

2015-05-09_08-21-51.png

Git status shows what I expected

2015-05-09_08-22-53.png

Thanks  
Matt  


Answers:
author: matthewsohswg
body: Johannes,

No I did not edit the file after staging it. I started off with a clean index and working directory, then I did
> git reset --soft HEAD\~2

to arrive at what you saw (see [Git Reset](https://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified)). I did not modify the file afterwards, index and working directory are the same.

You can see that git on the command line is reporting what we think correctly, but SourceTree is showing a "clean" file.

Seth, you are right, I had my filter set to All. I guess to SourceTree, clean means working directory is the same as index. I thought it might have been something related to reset.

thanks  
Matt

comments: author: Johannes Kilian
body: Ooops ... should have read the question more detailed ...I think your guess is right: git is already "aware" of your previous changes, as you staged your changes already. Therefore the state of your file in your working directory is clean (as your changes are already delivered to the staging area, where your file is stated as modified ...)


author: Seth
body: Actually, it looks like you have the SourceTree filter set to All Files (I typically use Pending). The All Files filter will show all files, regardless of status, in the unstaged pane.


author: Johannes Kilian
body: This is a feature of git. You probably came into this situation by editing the file AFTER you staged it.

*Staging* takes a snapshot of the current file and puts it into the "s*taging area* " (aka *Index*). If you edit your file after staging it, the snapshot within your working directory differs from the snapshot within the index (and the snapshot within index differs from snapshot in your repository). If you add your file again to the index (via git add), the situation changes: the snapshot in your working directory and the index are the same again - and you will only see the file in the staging area.

For more detailed information you might take a look for example [here](http://www.gitguys.com/topics/whats-the-deal-with-the-git-index)

This feature can be used for example to "git add" several changes of your file to the index (and to commit those changes) while ommitting other changes from the commit ,,,


Tags: mac
I can not downloan the sourcetree software!
Asked by lewlh lewlh:

I want to downloan the sourcetree for win7,but the website has a error which the errorcode is 404,please fix it.Thanks.


Answers:
author: Michael Hawkins
body: Try this.

<http://downloads.atlassian.com/software/sourcetree/windows/SourceTreeSetup_1.6.14.exe>
Databases Feature 'Custom View' (former Orderly)
Asked by Arno Dubois:

Since Databases feature has taken over from Orderly, the Custom View option has disappeared / seems to not be available anymore. Anyone any experience with this or has a workaround (I can no longer set / change a default view).


Answers:
author: Rodrigo
body: Hellou there [@Arno Dubois](/t5/user/viewprofilepage/user-id/5292978),

I think I get what you mean. In the past, you could set a "pin" in both: the database itself (Databases area) and the Database Macro (when nested on a page).

Since this is no longer possible, we became sad :D, but found a silly workaround.

* When you set a new default view in the DB and place a new Macro, the macro will show that view.
* If you switch the default view in the DB, the original macro will still retain the initial view set above.
* Thus, placing a new macro will show the new view.
* Repeat ???
* Profit

So basically, you can spend time updating the view and placing a new macro xD following this silly guide.

Hope this helps and my beautiful drawings make sense.

Best,   
Rodrigo

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

comments: author: Rodrigo
body: Ah! And to answer your question, you can still set a default view via the Databases entry on the side.

![db.png](https://community.atlassian.com/t5/image/serverpage/image-id/275522iA0E024DC38A23384/image-dimensions/169x100?v=v2 "db.png")


author: Arno Dubois
body: Amazing Rodrigo! That is exactly what I was after, tested and proven to work as expected. Thank you very much.


author: Rodrigo
body: Glad to help a fellow Databases Connoisseur. All the best.


author: Tomislav Tobijas
body: Hi Arno,

I can see that there is an option to create a new view and also to 'pin'/change the default view out of existing database views (navigated to **Databases \>** \*selected database)![2023-08-16_10-08-22.png](https://community.atlassian.com/t5/image/serverpage/image-id/275393i310222530D2CC474/image-size/large?v=v2&px=999 "2023-08-16_10-08-22.png")

Could you try this out?

Best regards,  
Tom

comments: author: Arno Dubois
body: Hi Tom,

Thanks for reply, I am aware and was trying this, however as per below, the pin option does not show for some reason ..

![Screenshot_1.jpg](https://community.atlassian.com/t5/image/serverpage/image-id/275519i4F40DB73A114209C/image-size/large?v=v2&px=999 "Screenshot_1.jpg")


Tags: cloud

confluence-cloud
How to add table constraints to a table?
Asked by Ankita Patel:

I want to add a certain conditions on the data that is to be entered in the table on the confluence page. I looked for table constraints options but couldn't find any. Can someone me guide me through this...  
Like in the below table the user should only be able entry values between 0-2 and nothing else; if they enter something else it should prompt an indicator stating incorrect input.

![Screenshot 2023-08-15 at 11.26.37 AM.png](/t5/image/serverpage/image-id/275254i21F31DCBF447433A/image-size/large?v=v2&px=999 "Screenshot 2023-08-15 at 11.26.37 AM.png")


Answers:
author: Tomislav Tobijas
body: Hi Ankita,

Native Confluence editor doesn't support adding conditions/regex patterns to table cells. However, you might explore [Atlassian Marketplace](https://marketplace.atlassian.com/) for some add-on solutions that might provide required (or similar) functionality.

Also a note - Atlassian has recently announced the acquisition of Orderly Databases (add-on by K15t) that will be transformed into a feature called Confluence Databases (currently in**Alpha** stage). You can read more here: <https://community.atlassian.com/t5/Confluence-articles/Databases-are-coming-soon-to-Confluence/ba-p/2336724>  
With that, you could probably create *dropdown* field that would have "0", "1" and "2" as options that users could select.![2023-08-16_10-23-14.png](https://community.atlassian.com/t5/image/serverpage/image-id/275396i2866454835F15F84/image-size/large?v=v2&px=999 "2023-08-16_10-23-14.png")

Best regards,  
Tomislav


Tags: cloud

confluence-cloud
Roll out or Copy Pages/Foldes between multiple clients (Spaces)
Asked by Ramon Vilela:

Hi, I'm wondering what the best approach to keep content updated between spaces.

<br />

I have a template in one space, and I need to keep another 5 spaces up to date.

So far I found the solution as "page macro".  
Is there any plugin that meets this requirement? Or some other way?  
Thanks


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

A simple way to do this is with the "include" macro. If you create page 1 with all the content you need, you can put "include page 1" macro on pages 2, 3, 4 and 5. When you amend page 1, then 2, 3, 4 and 5, will all reflect all the changes the next time they are loaded or refreshed.


Tags: cloud

confluence-cloud
Gliffy Diagram - Export/Save-as PDF
Asked by brandon_torvick:

Hello,

I have an interactive Gliffy diagram with layers that I would like to export/save-as a PDF so I have a physical copy at the ready. Is this possible? The diagram that I'm structuring might be passed off to internal/external auditors who don't have access into Confluence.

Thanks in advance!

--Brandon


Answers:
author: Samie Kaufman - Your Gal at Gliffy
body: Hi [@brandon_torvick](/t5/user/viewprofilepage/user-id/5278794) !

We do not have PDF export, but I'll pass along that request to our product team. :)

You can export Gliffy as PNG, JPG, or SVG image formats using File \> Export. When you do so, make sure the layers you want visible in your export are toggled on.

Thanks!

Samie

comments: author: brandon_torvick
body: Thanks for the confirmation, Samie. I am glad I didn't spend too much time trying to figure this out!

--Brandon


author: Barbara Szczesniak
body: [@brandon_torvick](/t5/user/viewprofilepage/user-id/5278794) Following up on [@Samie Kaufman - Your Gal at Gliffy](/t5/user/viewprofilepage/user-id/3569976)'s response, I would suggest making exports of:

* each layer separately
* base layer + each successive layer

Then you have graphics of all of the possible combinations. You could use them to make an animated GIF or video or some other way to present them (depending on the software available to you).


author: brandon_torvick
body: Good morning, Barbara:

Thanks for the additional input! As convenient as this sounds, I was going over my Gliffy diagram with my manager a mere 10-minutes ago trying to decide if this App (we are currently in trial) is what our department needs and we stumbled upon the exporting piece navigating the menus.

I am going to reach out to Sales this morning and get a hard number/quote to subscribe to Gliffy. The community and support based around this product is very good, which makes the difference when you're in a tight spot and need some advice.

Thanks!

--Brandon


Tags: cloud

confluence-cloud
Exporting a page to PDF without knowing its page ID
Asked by Sapir Ben Baz:

I'm trying to export to PDF a page without knowing its page ID via REST API or the Atlassian Python API.   
I only have its URL. Here's an example of the URL:

<https://my-product.atlassian.net/wiki/spaces/MY-SPACE-NAME/overview>  

As I only have the URL, without knowing its page ID, I tried understanding how such export can work, and for now it doesn't seem promising.   
I've noticed that when I try to get the space's content, the page I'm looking for is returned. In fact, on this page's **_links** attribute, there's another attribute called **webui** whose value is **/spaces/MY-SPACE-NAME/overview** (in addition to the **self** page attribute, that returns the actual link of the page **<https://my-product.atlassian.net/wiki/rest/api/content/PAGE-ID>** ).  

Other than getting the space's entire content and start looking for the **webui** attribute that matches the URL I'm looking for, is there a better option to export the page to PDF?  

Thanks everyone in advance!


Answers:
author: Marc - Devoteam
body: Hi [@Sapir Ben Baz](/t5/user/viewprofilepage/user-id/5292778)

Welcome to the community.

There is no option to export page or space to PDF, Word or HTML via the API.

Al long running open issue at Atlassian can be found here: <https://jira.atlassian.com/browse/CONFCLOUD-37995>

You can vote for this, but I don't see this option comming soon

comments: author: Sapir Ben Baz
body: Thank you Marc, good to know.   

I managed though to export a page to PDF with its ID via the Atlassian Python API package. Do you happen to know how the above can be achieved with it?


author: Marc - Devoteam
body: Hi [@Sapir Ben Baz](/t5/user/viewprofilepage/user-id/5292778)

Sorry now, as these packages are not Atlassian owned.

I do see this python option in

```
# Export page as PDF# api_version needs to be set to 'cloud' when exporting from Confluence Cloud.confluence.export_page(page_id)
```

As I'm not well evolved in python, II'm afraid I can't help you further on this.

I got the information from here: <https://atlassian-python-api.readthedocs.io/confluence.html#page-actions>


author: Chris Bowen
body: [@Sapir Ben Baz](/t5/user/viewprofilepage/user-id/5292778) what you can do is get a list of page IDs from the space, then loop through them for each one. Or you can loop though them and find the one you want. The issue I am having is getting it to get all the data with it such as images.


Tags: cloud

confluence-cloud
Table of Content not providing any content but in preview its showing
Asked by Namrata Patel:

Hi Team,

While adding Table of Content with type Flat view , in preview its showing as expected but when its added its not showing any details.

Attached screenshot for reference:

![Confluence Table of Content.png](/t5/image/serverpage/image-id/275189i906DE5BD4C6BCD16/image-size/large?v=v2&px=999 "Confluence Table of Content.png")

Regards,

Namrata


Answers:
author: Barbara Szczesniak
body: [@Namrata Patel](/t5/user/viewprofilepage/user-id/5284234) I use Cloud, which may be different than server, but I see something similar while **editing** the page---the actual table of contents with the headings only shows when I **publish** the page.

Are you seeing this on the published page?

comments: author: Namrata Patel
body: [@Barbara Szczesniak](/t5/user/viewprofilepage/user-id/5187859) Thank you so much ...yeah you are right while editing the page table of content is not available once page is published actual table of contents available. :)


Tags: confluence-server

server