youngmon/atlassian-qna huggingface dataset:
Unable to commit "unable to create temporary file"
Asked by James Koster:

Hi there,

I'm managing a couple dozen github repos with SourceTree and today I noticed I cannot commit anything to any of them. I get the following error;

```
error: unable to create temporary file: No such file or directoryfatal: failed to write commit object
```

Running OSX 10.8.4

Any ideas?

EDIT: I've rolled back from ST 1.6.3.1 to 1.6.1 and that resolves the issue. Obviously not ideal though..!

Is there anywhere I can download older versions? I just happened to have 1.6.1 in my donwloads folder and can't find a link to other versions to test further.


Answers:
author: KieranA
body: Hi James,

You've encountered an error which a few other users have encountered which unfortunately has no explanation. Many, many people are using 1.6.3.1 without any problem. We haven't yet nailed this one.

It's logged on JIRA here <https://jira.atlassian.com/browse/SRCTREE-1680> and I've added this AAC to it as a reference.

If you want to download any other version of SourceTree you can just change the link here in the URL to whichever version you need. You can use the [changelog](http://www.sourcetreeapp.com/update/ReleaseNotes.html) as a reference point for version numbers. So for 1.6.1 you can use the URL as follows:

<http://downloads.atlassian.com/software/sourcetree/SourceTree_1.6.1.dmg>

Hope that helps in the meantime, but we will be looking for a solution to this problem.

Cheers
Empty files as binaries
Asked by evilensky:

Zero-length or empty files are reported by SourceTree as binary files with no preview available. Is it possible to have some information about the file displayed?


Answers:
author: KieranA
body: Hi Eugene,

We've had various requests on what to display for binary files. We've got some already-open issues on this. Could you open an issue on [jira.atlassian.com](http://jira.atlassian.com) (project SRCTREE or SRCTREEWIN for Windows) and describe precisely what you're looking for and on what type of files? This way it'll be a feature request that us devs can look into in the near future.

Thanks in advance


Tags: empty

git
Source Tree: Custom merge tool not launching
Asked by Eric Liebowitz:

In my Source Tree "External Diff/Merge" settings, I have the following entries

**Merge Tool**: "D:\\Program Files\\IntelliJ IDEA Community Edition 12.1.2\\bin\\idea.bat"

**Arguments**: merge $LOCAL $REMOTE $MERGED

If I were to run the following command from the Windows command line, my merge tool (IntelliJ) would fire up normally (note that "a.txt", "b.txt", and "c.txt" are dummy filenames):

"D:\\Program Files\\IntelliJ IDEA Community Edition 12.1.2\\bin\\idea.bat" a.txt b.txt c.txt

However, in SourceTree, the merge tool will to fire up. Sometimes, I can even see IntelliJ running in my task manager, and I can see the files SourceTree generates for diffing. But the files will suddenly dissappear, the IntelliJ process dies, and nothing happens in SourceTree.


Answers:
author: Johannes Ebner
body: You will need to use a launcher script:

<https://www.jetbrains.com/help/idea/2016.1/running-intellij-idea-as-a-diff-or-merge-command-line-tool.html?origin=old_help>
Working Copy Discard does not discard unstaged submodule changes
Asked by strich:

Given a simple Git setup with at least 1 submodule repository, make a change within the submodule. Now, you want to update your current branch to the latest but it will fail due to unstaged changes in the submodule. Discarding Working Copy changes will succeed but it will not discard unstaged changes within the submodule.

Fixing this problem requires the user to have to realise the unstaged changes within the submodule, specifically access it, discard the changes, then go back to the parent branch and finally perform a Pull.

Would be great if we could simply this process a bit to have Working Copy-\>Discard properly discard all unstaged changes in children submodules.


Answers:
author: strich
body: Windows v1.0.8.0.


author: KieranA
body: Is this for Mac or Windows?
Feature branch with one commit
Asked by s_shatzkiy:

Hi!

I'm new to git and SourceTree. We plan to use git in our new project with git flow. I tested features of SourceTree and have one question.

When I start a new feature, make one commit and finish the feature - history looks linear - as if I simply committed to the develop branch. But when I start a feature, make two or more commits and finish it - then the history shows branches from develop.

Is it behavior correct or did I miss something? I tried the same thing with another git tool and got expected results. I prefer SourceTree however and want to solve this issue.


Answers:
author: s_shatzkiy
body: I found explanation of described behavior in git flow sources (<https://github.com/nvie/gitflow/blob/develop/git-flow-feature>).

```
# merge into BASE	git_do checkout "$DEVELOP_BRANCH"	if [ "$(git rev-list -n2 "$DEVELOP_BRANCH..$BRANCH" | wc -l)" -eq 1 ]; then		git_do merge --ff "$BRANCH"	else		if noflag squash; then		    git_do merge --no-ff "$BRANCH"		else			git_do merge --squash "$BRANCH"			git_do commit			git_do merge "$BRANCH"		fi	fi
```

```
?
```

```
But I have no idea why there is this "if" with fast-forward and without fast-forward.
```

comments: author: s_shatzkiy
body: Relevant issue on git flow - <https://github.com/nvie/gitflow/issues/292>


author: Ilya Shaisultanov
body: There's an open issue regarding this - [https://github.com/nvie/gitflow/issues/292](https://github.com/nvie/gitflow/issues/292.). Seems that it was author's decision, with no explanation given.


author: KieranA
body: Hi Sergey,

This sounds like a simple case of a fast forward commit which means your commit is directly upstream of the branch. The [git-scm docs explain it well](http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging):
> You'll notice the phrase "Fast forward" in that merge. Because the commit pointed to by the branch you merged in was directly upstream of the commit you're on, Git moves the pointer forward. To phrase that another way, when you try to merge one commit with a commit that can be reached by following the first commit's history, Git simplifies things by moving the pointer forward because there is no divergent work to merge together --- this is called a "fast forward".

A fast forward commit is the default in SourceTree because in those cases there's usually no need to have a branch history like that, it may as well be linear. You can turn this off though from within SourceTree by turning the checkbox "Create a commit even if merge resolved via fast-forward" from the merge sheet.

Hope that helps

comments: author: s_shatzkiy
body: Yes, I can do it with plain merge (button Merge on toolbar), thank for your advice, and I already try it. It works. But can I reach this goal by git flow feature (button Git Flow on toolbar)? Or when SourceTree finish gitflow branch it always do fast-forward in merge?![](../../upfiles/SourceTree.png)


author: s_shatzkiy
body: Thank you for help, I post my own answer to my question. Can you provide may be any comments to this answer?


Tags: git-flow
SourceTree Categorize Branches
Asked by dsmoore1600:

Is there a way such that within sourcetree, you can categorize your branches of a git repository? I would like to be able to right click on a branch and mark it as important, awaiting pull request, or something similar. Please let me know if this is possible. Thank you for your help, David


Answers:
author: KieranA
body: You can name your branches in a folder structure-like format and they appear as folders in SourceTree. For example you could name it as features/issue_1539 and SourceTree will display 'features' as a folder. Currently we don't categorise branches though with a tag-like format, but you could always file a feature request over at [jira.atlassian.com](http://jira.atlassian.com) (project SRCTREE for Mac, SRCTREEWIN for Windows).

Hope that helps

comments: author: dsmoore1600
body: Thank you for your advise, I will file a feature request.


author: Kalin Milislavov
body: Thanks for your shared knowledge!


author: Johannes Kilian
body: I don't think this is possible .... haven't seen anything like this yet within GUI.

Perhaps setting a temporary local git-tag to indicate those things might be a not-so-ideal solution ...
WinMerge returns "right path is invalid" error when launched from SourceTree
Asked by asle9634:

I'm using SourceTree for Windows and I've set WinMerge as my external diff tool. When I click on the "External Diff" button WinMerge launches with the left path set to the appropriate file and the right path is empty. A message at the bottom of the WinMerge windows indicates "Right path is invalid!". I've tried using the custom option with combinations of $LOCAL, $REMOTE, and $BASE with each combination returning the same error. How do I get WinMerge to work with SourceTree?


Answers:
author: asle9634
body: Using Embedded Git fixed my issue. Go to Tools -\> Options -\> Git -\> Click on "Use Embedded Git"


author: Ashley Wilson
body: I've been using WinMerge as diff tool without changing any settings, with a git repo. Are you using it for git, or mercurial?

comments: author: asle9634
body: I'm using it for GIT. I found a solution, I'll post it below.
is it possible to have "Current Branch" as default choice when switching branches?
Asked by Johan Thureson:

If I have chosen "Current Branch" and switch branch,

"All Branches" are chosen.


Answers:
author: KieranA
body: Hi Johan,

We've had varying requirements from users on this which are worth taking a look into, for example, per-repo filter remembering for these specific options. Could you file this issue in [jira.atlassian.com](http://jira.atlassian.com) project SRCTREE for Mac or SRCTREEWIN for Windows and just jot out precisely what you'd like? We're more than happy to take a look into it.

Thanks in advance


author: Johan Thureson
body: Thx

This is the feature I added:

<https://jira.atlassian.com/browse/SRCTREE-1754>
transfer bookmarks setup
Asked by epataky:

i setup 5 different repos from 5 different people .. i want to setup someone else's computer exactly like mine ... can i transfer this setup of directories, bookmarks, etc, from sourcetree, to someone else's computer?


Answers:
author: Geoff Sokoll
body: I have the same question, and am likewise on Windows. Any suggestions ?


author: KieranA
body: Hi Ed,

We get asked this question quite often. The problem is that your bookmarks file is relative to the directory structure of that user. We use absolute paths rather than relative paths meaning they're seen as /Users/Ed/Some/Location. This does mean you could technically copy the bookmarks file and do a find/replace, but you'd also need the repositories in the same location as yourself, too.

The bookmarks file is in \~/Library/Application Support/SourceTree/browser.plist. If you've got an editor that can support this (it's just XML) then you can open it up and see the paths. Copying this file and using it as a basis will help, then as I say, just do a find/replace and copy over the repositories and technically it should work fine.

Hope that helps

comments: author: epataky
body: thank you ...


author: epataky
body: i am on windows .. where is this file on windows?


author: epataky
body: i am on windows .. where is this file on windows?
Interactive rebase to reword previous commits
Asked by D K:

Can SourceTree do an interactive rebase with reword?

I need to change the commit messages for a number of previous commits.

Unfortunately I cannot use commit ammend because it is not just the last commit.


Answers:
author: D K
body: Ok. I can swee this on Mac but not on Windows version

comments: author: KieranA
body: The Mac and Windows SourceTree are completely independent products. Windows is catching up to what the Mac does at the moment. Interactive rebase isn't implemented yet in Windows but should be in the future.

Hope that helps


author: KieranA
body: Hi D K,

Sure thing! SourceTree 1.6 supports interactive rebasing, just context-click on the commit you wish to rebase from (or hit the Repository menu and hit "Interactive Rebase") and then double click on the message column which opens a popup so you can change your commit message. Hit OK on that and it'll run through the commits.

Make sure you don't do this on already pushed commits though as it'll cause problems for people pulling those changes later on.

Hope that helps


Tags: git
how to disable <<<<<<< HEAD message when merging from the code.
Asked by rubinyoo:

Also, what does that message mean? \<\<\<\<\<\<\< HEAD and some number 1280930129839asdf


Answers:
author: MB
body: That message tells you where the conflicts exist after you tried to merge two versions of a file, when git couldn't figure it out itself how to properly merge the changes. Shortly, git couldn't merge the changes automatically, so it wrote markers at those places (where changes couldn't be automatically merged) for you to look at it and fix it manually.

You can read this article, to get a better understanding of that: <http://genomewiki.ucsc.edu/index.php/Resolving_merge_conflicts_in_Git>

For example, if you have a merge conflict and you ended up with something like this:

```
&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:mergetest This is my third line ======= This is a fourth line I am adding &gt;&gt;&gt;&gt;&gt;&gt;&gt; 4e2b407f501b68f8588aa645acafffa0224b9b78:mergetest
```

you will edit that text and make it look something like this:

```
This is a correct text now and it should have been here if the git could merge the files successfully.
```

So, you'll replace that entire block with a valid text, that should stay there (also removing those markers that start with "\<\<\<\<\<\<\<", "=======" and "\>\>\>\>\>\>\>").
Need xwork 1.0.3.6 code
Asked by P:

How can I access

[](https://bitbucket.org/opensymphony/xwork/)<https://bitbucket.org/opensymphony/xwork/>

Currently getting access denied


Answers:
author: Alejandro Conde Carrillo
body: Hello Pratik.

The permissions for that repository should be public and I can confirm I have access to the repository withnout being logged in.

The commit with the fix for that bug is: <https://bitbucket.org/opensymphony/xwork/commits/e968cd7d50e0432f440b134df5dc295c53255a15>


Tags: xwork
how to run SourceTree in mac OSX
Asked by Phileo99:

I installed SourceTree onto my mac pro outside of the App Store, so it is not on my list of Applications.

I've rebooted, lost the link to SourceTree on the Desktop. How do I run SourceTree?


Answers:
author: KieranA
body: Hi Albert,

If you run the dmg that you downloaded then a window should appear so you can drag SourceTree over to your applications folder. That's all there is to it as per other applications you download outside of the App Store.

Hope that helps

comments: author: Phileo99
body: thanks for the assist!
How to hide my update action in xxx/#all-updates pages
Asked by wsc:

I am an employee in company which use confluence as wiki.

I don't want to show my updates action in wiki all-updates page, don't want others see my updates.

Is there any method to solve this?


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

Confluence is a collaboration tool so you can't limit your update visibility. It depends from space permissions so that if a user has view permission on a page and you update it, the update will be visible to all other users that have permission to view it.

You can limit view visibility at space level.

Hope this clarifies,

Fabio
Where did it go - the positioning of edit to where you already were on the page
Asked by Steve Bradley:

A little while ago, we got this feature - quite nicely positioning edit to where you were on the reading page (give or take a small amount)

It was fantastic.

Now it's disappeared - we're editing at the top again.

When are you coming back lovely feature?


Answers:
author: Barbara Szczesniak
body: [@Steve Bradley](/t5/user/viewprofilepage/user-id/3781649) thank you for letting me know that I was not imagining this. I also miss this feature!

comments: author: Steve Bradley
body: I noticed today that the feature has returned.

Happy Happy


Tags: cloud

confluence-cloud
Automation between JIRA fields & Orderly Database
Asked by danmachen:

We're using the orderly database for managing metadata attached to the Epics we're closing as a company. When we close an epic, we store the information related to that epic in a Confluence page. The orderly database sits on that page and contains information such as the "Project Name", the "Epic Close Date" as well as the "Epic Title".  

We've discovered a great automation between JIRA and Confluence that allows us to automatically create that Confluence page when we add the Epic in JIRA.

To make this a truly awesome sync, it would be amazing to have the epic populate the Orderly database with the fields from that the epic. This means the team create the epic in JIRA and part of the page creation and metadata management can be actioned from one place. Having it update bi-directionally would be a nice-to-have but the type of metadata we're managing really only needs to be created once.

It would allow those great JIRA-confluence links like "mentioned on" to help people navigate easily between those two places.

Here's hoping that Atlassian with solve this stuff with the new Confluence Database!


Answers:
author: danmachen
body: Adding that this capability would be amazing to add under JIRA Automation --\> New Action --\> Update Confluence Database Field


Tags: automation

cloud

confluence-cloud

database

jira
Want to create a confluence workflow plug-in
Asked by xiongpanfeng:

??confluence???????????????confluence??????????????demo


Answers:
author: Jamie Esker _Appfire_
body: Hi [@xiongpanfeng](/t5/user/viewprofilepage/user-id/4844671)

Full transparency: I am the Product Marketing Manager for Appfire's Document Management apps. We have a few options that can help with this. [Comala Document Management](https://marketplace.atlassian.com/apps/142/comala-document-management?hosting=datacenter&tab=overview) is our app for workflows. If you don't need everything this app offers, there is Comala Document Control and Comala Document Approval.

Ollie mentioned Comala Publishing; this will let you publish your approved documents to a copied space or add them to a designated Collection restricted to specific groups or users. If you are on Server, you will not be able to start a trial due to the Server's end of life next February, but you may do so if you are on Data Center.

I hope this helps!

Jamie

comments: author: xiongpanfeng
body: I want to create a confluence flow plugin myself


author: Ollie Guan
body: Hi [@xiongpanfeng](/t5/user/viewprofilepage/user-id/4844671) ,

??????????

[ConfiForms - Data Forms \& Workflows for Confluence](https://marketplace.atlassian.com/apps/1211860/confiforms-data-forms-workflows-for-confluence?hosting=server&tab=overview)

[Comala Publishing](https://marketplace.atlassian.com/apps/143/comala-publishing?hosting=server&tab=overview)

comments: author: xiongpanfeng
body: I can't install other plugins and need to customize a confluence workflow plugin


author: Ollie Guan
body: You can read the Confluence Plugin Guide for an overview of what plugins are. This document introduces Confluence plugins to developers who may want to write their own.

<https://developer.atlassian.com/server/confluence/confluence-plugin-guide/>


author: xiongpanfeng
body: View the confluence workflow module, the documentation is not clear, can not understand


Tags: confluence-server

server
Status macro changes color when imported into a Page Properties Report
Asked by SV:

A Status macro shows the correct color (yellow) on a Confluence page. However, when imported into a Page Properties Report on another page, it is displayed in a different color (blue).

Has anyone experienced a similar problem? Any fix or a workaround?

Thanks.


Answers:
author: Stephan Bauer
body: The background and text colors still get changed (see my post above), but at least it's yellow again instead of blue. Works for me.

comments: author: SV
body: Thanks, [@Stephan Bauer](/t5/user/viewprofilepage/user-id/4888279). Yes, the same here. But at least the color is now yellow instead

of blue.

![pic1.jpg](https://community.atlassian.com/t5/image/serverpage/image-id/265358iA92E81ED6E99E2BC/image-size/large?v=v2&px=999 "pic1.jpg")![pic2.jpg](https://community.atlassian.com/t5/image/serverpage/image-id/265357i31AE17E3FE7CE676/image-size/large?v=v2&px=999 "pic2.jpg")


author: Lukas Obkircher
body: I can reproduce it, but no fix so far![page_prop_bug.png](https://community.atlassian.com/t5/image/serverpage/image-id/263064i9D8514D2BFEF4167/image-size/large?v=v2&px=999 "page_prop_bug.png")

comments: author: SV
body: Thanks for reproducing it, Lukas. I found this same problem reported in CONFCLOUD-71544. Atlassian was unable to replicate it and closed it as Resolved !?

Sasha


author: Adrienne Zulueta
body: I'm experiencing the same issue.

Adrienne


author: Stephan Bauer
body: This does not only effect yellow. I have a page properties macro with three different colours (green / yellow / red) and the all appear different in the page properties report macro. Green is still green and red is still red, but they are changed.

Colours as chosen in the page properties macro:

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

Colours as shown in the page properties report macro:

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


author: Michael Inglis
body: Same issue here - it doesn't appear to be consistent across different pages within the same space. One page properties report retains the original colouring but if I copy it into the page with the problems, it immediately adopts the bonkers new colour scheme as soon as I paste it in.


author: Marc Dixson
body: This just started a couple of days ago for me.


author: SV
body: The Status macro is now showing the correct color in My Page Properties Report. Perhaps Atlassian has fixed the problem. Could anyone else confirm?


Tags: cloud

confluence-cloud
Remove "More actions" from an anonymous space
Asked by Joseph Alberto Sierra Barahona:

I'd like to restrict/remove the "More actions" option from an anonymous space, how can I do this?


Answers:
author: Brant Schroeder
body: [@Joseph Alberto Sierra Barahona](/t5/user/viewprofilepage/user-id/5242663) Welcome to the Atlassian community

There is not a way to do that. You can vote for a feature request that is focusing on enhancing public access. <https://jira.atlassian.com/browse/CONFCLOUD-58930>


Tags: cloud

confluence-cloud
Horizontal Navigation Bar
Asked by smorales5:

I created a horizontal bar with 7 tabs across - each representing a department. I have created individual team pages for each department that I want opened when one clicks on the department from the horizontal bar selection. However, when I create the "insert page" marco within the "Horizontal Navigation Bar Page" marco I get two of the same department appear of the horizontal bar, in addition to the horizontal bar tabs within the child page. Is there a way for it not to duplicate the tab names?  

![TEAM Screenshot.PNG](/t5/image/serverpage/image-id/263010i8DE82A939A30B283/image-size/large?v=v2&px=999 "TEAM Screenshot.PNG")


Answers:
author: Brant Schroeder
body: [@smorales5](/t5/user/viewprofilepage/user-id/5242595) welcome to the Atlassian community

What app are you using?


Tags: cloud

confluence-cloud