youngmon/atlassian-qna huggingface dataset:
SourceTree - Error when pushing to Gerrit
Asked by Bob Liu:

After I updated SourceTree to version 2.0.5.2, it cannot push commit to Gerrit. While using 2.0.1, it is OK. I think the reason is SourceTree using different push command.

The old version using like:

```
git push origin HEAD:refs/for/master
```

The new version using like:

```
git push origin HEAD:refs/heads/refs/for/master
```

Is there any way to let new version SourceTree using the same command like old ones?


Answers:
author: Jim McNealy
body: I was able to work around this by creating a git alias, then in Sourcetree create a custom action for the repo.

git config --global --add alias.pushooks '`push origin HEAD:refs/``for``/master`'

Source tree custom action:

Script to run: git

Parameters: pushooks

Check Show full output


author: Norbert Nemes
body: I have the same problem. 2.0.4 is also OK.

comments: author: Paul Townsend
body: There is a bug open for this: <https://jira.atlassian.com/browse/SRCTREE-2940>


Tags: gerrit

git

push
sourcetree -git branch --merged and git branch --no-merged
Asked by sreekumar_menon:

Does sourcetree have an equivalent of -git branch --merged and git branch --no-merged

How do I find which branches are complety included in a branch and also not included?


Answers:
author: sreekumar_menon
body: Thanks Seth,

Feature request created-

<https://jira.atlassian.com/browse/SRCTREE-3051>


author: Seth
body: No, it doesn't. That sounds really useful, though. You can make a feature request at jira.atlassian.com. Post a link back here to help others find your feature request.


Tags: branch
Why does one file in my project think its completely being changed?
Asked by Richard Fyffe:

So I'm using source tree and I'm working on a website, however 1 of my JS files ALWAYS treats the whole file as a single hunk. Hunk 1: Lines 0-0 It shows the first line as removed, then the whole file in white then the first line in green and the whole file in white. So its impossible to review what changes I made, discard or change individual hunks/lines. No other file is doing this and its only this file. It also appears this way in bitbucket so without doing a side-by-side diff I can't see what changes were done. Why is this happening? What steps should I take to resolve this?


Answers:
author: jonbhanson
body: I had the same problem, Hunk 1: lines 0-0 and it would not show updates in the file. I was able to solve the problem by copying the code, deleting the (php) file in question, creating it again fresh, and pasting the code back in. YMMV.


author: Seth
body: I would suspect white-space changes, possibly line-endings. Is SourceTree configured to show whitespace changes in the diff panel?

comments: author: Richard Fyffe
body: Yes, if I add a few empty lines to a normal files it'll show as new empty lines in source tree.


author: Seth
body: By "line-endings", I don't mean extra newlines, I mean the different byte sequences that can be used to signify a new line based on the source OS.<http://en.wikipedia.org/wiki/Newline>


author: Seth
body: If you switch sourcetree to ignore whitespace, you should be able to get a useable diff.


author: Richard Fyffe
body: So I actually checked the settings and it's already set to ignore white space, I was testing with new lines.


author: thinsoldier
body: FYI SourceTree's diff panel doesn't seem to have a clue about displaying files that use Classic Mac line endings.


author: thinsoldier
body: FYI if you set a file to be executable it will show as changed but without showing any lines have actually changed.


author: Richard Fyffe
body: If its the line endings why is only one file effected? How do I change this file to a crlf endings?If its executable how to a revert that?
How can I copy/paste from the changes area to the notes area in SourceTree commit?
Asked by nevilleb:

Hello,

I'd like to copy paste items like filenames, field names and function names from the changes/hunk area on the right to the commit area at the bottom. I can't figure out how to select and copy.

Is there a way to do this?

<br />

Thanks,

Neville


Answers:
author: willemvos
body: would be nice to have this, crtl-c ctrl-v isn't working. Anyone know?


Tags: commit

copy

paste
Sourcetree installation: invalid drive
Asked by Eugene Seah:

I am trying to install sourcetree on my main drive now that my program drive has failed.

However, it gives the error above. Uninstalling is not an option as it complains that "there is a problem with this windows installer package...."


Answers:
author: Nic Brough -Adaptavist-
body: Your old installation has put pointers into the registry to tell Windows where it is. When you try to uninstall, a standard Windows installer package can't cope with damaged or physically removed installations and simply crashes out.

I'm afraid you will need to clean the sourcetree markers out of the registry to enable the installer to work

(This is one of many reasons why a monolithic registry is a terrible idea for an operating system, and we still don't understand why MS haven't moved to a model that works in the real world. Heck, even the dependency hell that Linux package managers inflict on us is better than that)

comments: author: Eugene Seah
body: Thanks. I was hoping there was a way to force install over a previous installation.


author: minnsey
body: You could try Microsoft FixIt [SourceTree KB: Fixing Install/Uninstall problems - Windows](https://confluence.atlassian.com/pages/viewpage.action?pageId=735642921)

comments: author: Eugene Seah
body: Thanks. Unfortunately I have already manually removed entries before seeing your post. Haha.
Where is Sourcetree for Windows 1.9.x.x?
Asked by Ken Seehart:

Where is the latest version of SourceTree for Windows?

I've bee here: <http://www.sourcetreeapp.com/download/>

but that gives me version 1.6.14.0. I don't think that is really the latest, since it is missing new features, and because I see mention of 1.9.4.1 in the blogs.

When I go here: <http://downloads.atlassian.com/software/sourcetree/windows/>

I see:

|--------------|---|------------|
| **Name:**    |   | SourceTree |
|                             |||
| **Version:** |   | 0.9.2.3    |

What's up with that? Are your download links up to date?


Answers:
author: Seth
body: The version numbers for Windows do not match up with the version numbers for Mac. The version numbers you see in blogs are the Mac version (currently 2.x). The latest for Windows is 1.6.14.0

comments: author: Ken Seehart
body: I see. Does that mean there are features missing from the Windows version? Is the Windows version way out of date?


author: Ken Seehart
body: For example, Windows SourceTree 1.6.14.0 does not have "View\>Show Command Output" which has been on the Mac for about a year or so.


author: Seth
body: There are certainly some features that are in Mac but not Windows, but not as many as you'd expect based on the difference in version numbers. SourceTree for Windows 1.6 does not have the same feature set as SourceTree for Mac 1.6 did. The main difference is that SourceTree for Windows is newer, and most features lag behind by a few months.


Tags: windows
?????????????????????????????????
Asked by CLERK WHITE:

????????????????????

sourcetree.png

[](https://community.atlassian.com/t5/Sourcetree-questions/%E6%A8%B9%E5%BD%A2%E5%9B%B3%E3%81%AE-%E3%81%8C%E5%90%84%E8%A1%8C%E3%81%AE%E3%83%9F%E3%83%89%E3%83%AB%E4%BD%8D%E7%BD%AE%E3%81%A7%E3%81%AF%E3%81%AA%E3%81%8F-%E3%83%88%E3%83%83%E3%83%97%E4%BD%8D%E7%BD%AE%E3%81%AB%E8%A1%A8%E7%A4%BA%E3%81%95%E3%82%8C%E3%81%A6%E3%81%97%E3%81%BE%E3%81%86/qaq-p/51499?attachment-id=10552){#link_116a5bfeb555d0}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/1512/1/sourcetree.png){#display_116a5bfeb555d0_0}


Answers:
author: mai_nakagawa
body: Hi there,

Thank you for asking. You asked the same question at Atlassian Support, so let's discuss there.

???????????????????????????????????????????????

Cheers,

Mai Nakagawa


Tags: language-ja
How can I learn to work with the SourceTree terminal?
Asked by Tom Recht:

What's going on inside the SourceTree terminal? It's similar to a Unix shell, but there's other things going on, for instance the (partial?) list of commands that printed before the new prompt every time a command completes. Some Unix commands work, others don't. Is there a way to expand the width? It would be nice to understand what I'm dealing with.


Answers:
author: Tim Crall
body: If you're on a Windows machine, it's opening up a Git Bash window.

<https://msysgit.github.io/>

comments: author: izharaazmi
body: Most Windows users don't know that PC implies Windows PC unless specified to be \*NIX. So it might me good to explicitly say so.


author: Tim Crall
body: Really? Ok.
@Atlassian I'm using @SourceTree and want to see when a file has changed. Is this possible? If so, how?
Asked by Justice McCullum:

Asked by Jeremy L. from Twitter.


Answers:
author: Tim Crall
body: If you're wanting to see the history of a file, you can go into the File Status View, right-click on the file, and select Log Selected


author: Seth
body: Does this mean "When a file changes, can SourceTree show me that it has changed?" or "Can SourceTree show me the date and time a file was changed?"


Tags: twitter
SourceTree problem on push/pull operations
Asked by Ariel Carrera:

I have a problem with SourceTree. After than I has re configured my ssh configuration, i began with my problems...   
When I launch a 'push' or 'pull' action from SourceTree... the SourceTree's loader bar never ends and doesn't hide...   
When i open a terminal... and do a 'git push' or 'git pull' command... all works ok... (after thats SourceTree can see my project's changes in the view but still persist the problem).  
What is the problem? Is an ssh-agent's problem? (I could see that sometimes i have more than one instance of this process if i open more than one terminal...)  
I am working on 'Windows' with the last version of SourceTree... I configured my ssh keys and agent again but the problem still persists...


Answers:
author: tonymke
body: Experiencing this as well. Hangs on git push forever, doesn't actually try and connect or anything.

Opening a terminal and pushing the branch there works fine.


author: Brent Batas
body: Exact same problem here.
Un wanted SourceTree merges
Asked by Andr? Borud:

I've been working in the master branch of a project that is stored on bitbucket using git and I use SourceTree to manage it.

Yesterday I merged in a branch with the master one, but noticed that there has been merges with other branches prior to my merge. In SourceTree it says that I made the merge. In bitbucket it says that an anonymous user made the merge (strange as it is a private repo). I have absolutely no recollection of the previous merges.

Is there some kind of automated thing I have missed or anything that could have made this if I haven't ever even clicked on one of the other branches in sourcetree?

All I ever do is commit, pull changes if any, and push. How should that merge a branch?


Answers:
author: inside-logic
body: What I see when I am working with Git (and SourceTree but this is a Git functionality AFAIK) is that a pull from a branch to another branch will create a merge from that branch into this other branch. Might that be your effect that your pulls are those merges?

If I don't overwrite the suggested commit message the default message says something like: Merge branch 'master' of "someremote location" into myBranch.

comments: author: Tim Crall
body: A "pull" is very much a "merge". Specifically, it's a "fetch" plus a "merge".


author: Tim Crall
body: But you probably shouldn't be "pulling" anything into the master branch aside from the remote version of the same branch.


author: inside-logic
body: Right. Now that you mention it I remember that I read some documentation sometime back about fetch and merge :-). I just recalled that from my tests with sourcetree and when learning git I saw the effect in my test projects.


Tags: bitbucket-cloud

cloud
Sourcetree doesn't show internal diff if path has foreign accents
Asked by Henrique Tavares:

I just found out that if a path has foreign accents (ex: ???) the internal diff won't show any changes.

This is with a git repository, if I try it with an hg repository it works correctly.

Is there a solution for this? I really like the internal diff and wouldn't like to use an external.

NOTE: OSX 10.8.5, Sourcetree 2.0.5.2


Answers:
author: Seth
body: This is probably a bug in git, not SourceTree: <http://stackoverflow.com/questions/5854967/git-msysgit-accents-utf-8-the-definitive-answers>

Are you using embedded or system git? If embedded, I think SourceTree distributes git 1.8, which is prior to support for Unicode 6.3 or 7.0, as mentioned in that stack exchange thread.

comments: author: Henrique Tavares
body: Thanks for the reply. I am using the embedded git which is 2.2.1, and reading that SO topic, this version should support it now, but it doesn't. I tryed the system git (2.3.5), but it gave me all sorts of errors and was unuseable :(


Tags: bug

diff

git

path
Stop marking files as hidden?
Asked by Steve Jordi:

Hi,

I just used SourceTree Mac to commit files I have in a project. Since I also work on those files from Windows, I had the surprise to notice that the commited files are marked as hidden.

It's still possible to see them on the Mac finder, but when switching to Windows, they "disappear" and my compilers can't open them.

After checking the options, I didn't find any way to stop SourceTree mark them hidden.

Is there a way to avoid that behaviour?  
Thanks for any help

Steve


Answers:
author: Steve Jordi
body: Absolutely not.  
All files are fine as long as they don't pass through SourceTree. Once committed, only thoses ones are marked as hidden. All the other ones, excluded from .gitignore, are left as-is. The Windows side has nothing to do with this since they don't interact with those files and never set those flags in any manner.  
The only files that are suddenly marked as hidden are the ones going through a SourceTree commit.  
A manual commit via the git executable doesn't alter them either.

That's why I need to disable that *feature* in order to be able to use SourceTree as expected.

comments: author: Tim Crall
body: This should be a comment in response to the answer it is responding to, not an answer itself.


author: Bal?zs Szakm?ry
body: It is not SourceTree that marks your files hidden. One of the tools mentioned in your comment above will be the one doing it.


author: Steve Jordi
body: Hi,

yes I use VMWare Fusion and develop mainly from the Windows side, but all files and repositories are on the Mac side accessed via a shared folder: Y:\\projects\\...

Commited files have the Windows Hidden flag set though. I see them on the Mac side which ignores those flags, not in the Windows side unless I tell it to show hidden items. But my compiler doesn't see them natively.

Any way not to mark them as hidden?


author: Tim Crall
body: Are you using something like Parallels or is this repo stored on a network drive being accessed by two totally different machines?


Tags: windows
Can anyone help me on how we can create a tabs container macro using python?
Asked by razak shaik:

I tried to create a macro html and tabs container on the confluence server but after sending a PUT request I am getting an unknown macro for the tabs container, entering into edit mode I could see there is a tabs container, and for html macro the content is not visible. Please find the code below and help me with this.

I tried with tabs container, tabs-container, etc, and without third-party parameters.

\<ac:structured-macro ac:name="tabs-container" ac:schema-version="1" ac: third-party="true"\> \<ac:parameter ac: name="title"\>Mt Tabs conatiner\</ac: parameter\> \<ac:rich-text-body\>

\<ac:structured-macro ac:name="tabs-page" ac: schema-version="1" ac: third-party="true"\> \<ac: parameter ac:name="title"\> Tab 1 \</ac: parameter\> \<ac:rich-text-body\> This is content of TAB 1\</ac: rich-text-body\> \</ac:structured-macro\>

\<ac:structured-macro ac:name="tabs Page" ac:schema-version="1" ac:third-party="true"\> \<ac:parameter ac:name="title"\> Tab 2 \</ac: parameter\>

\<ac:rich-text-body\> This is content of TAB 2\</ac:rich-text-body\>

\</ac:structured-macro\>

\</ac:rich-text-body\>

\</ac:structured-macro\>


Answers:
author: razak shaik
body: We are using confluence server 7.19.6.

I am just sending the above content stored in a variable called updated_data using PUT request to confluence server.

data = {

"version ":{

"number" : 3

},

"title": "Testing",

"type": "page",

"body":{

"storage": {

"value": updated_data,

"representation": "storage"

}

response = requests.put(

parent_page_url,

json=data,

headers={"Authorization": f"Bearer {api_token}", "Content-Type": "application/json"},

)

print (response.text

comments: author: razak shaik
body: This question is specific to tabs container and tabs page macros. I just informed that html macros are also not working for me. Let me know if more details are required.


author: Sayed Bares [ServiceRocket]
body: [@razak shaik](/t5/user/viewprofilepage/user-id/5291561) welcome to the community!

What is your Confluence version? and what is the script you are using in python? you mentioned HTML macro but your storage format doesn't contain any, can you elaborate further on this?

comments: author: razak shaik
body: [@Sayed Bares \[ServiceRocket\]](/t5/user/viewprofilepage/user-id/1480984) Any on this please.


Tags: cloud

confluence-server

macro
jira url not inserting jira macro
Asked by James Nunnerley:

As per this page

<https://support.atlassian.com/confluence-cloud/docs/use-jira-and-confluence-together/>

The following feature is no longer working

* '\<yourjirasite.com\>/issues/?jql=' will insert the Jira Issues macro and display a list of issues matching the Jira search.

It just inserts the url.


Answers:
author: Sayed Bares [ServiceRocket]
body: [@James Nunnerley](/t5/user/viewprofilepage/user-id/2433398) You will have to add a JQL query at the end of your URL for it to work. For example,

* https://**\<yourjirasite.com\>**.atlassian.net/issues/?jql=created\>=-30d

comments: author: James Nunnerley
body: It wouldn't let me post a full url in the the original form, but yes I know that.


author: Brant Schroeder
body: [@James Nunnerley](/t5/user/viewprofilepage/user-id/2433398) Are you adding any JQL? By this I mean are you just copying the Jira search URL and pasting it in or are you just pasting \<yourjirasite.com\>/issues/?jql= ?

comments: author: James Nunnerley
body: There is jql.

I actually have a template with a url with embedded template variables. Until recently is was easy to copy and paste that URL and it would turn into a jira issues panel.

That recently stopped working for a number of weeks, however almost straight after posting this it's started working again.


Tags: cloud

confluence-cloud
Using Table Transformer SQL to group matching data into single table row
Asked by Scott Gillespie:

I have 3 tables with sprint info including sprint start and end dates (T1), resource name list (T2) with other data fields like Role, etc., and holiday information by resource (T3). I need to find any holidays for a given resource that fall within the sprint start and end dates. Ideally, the result will be an updated T2 table listing each resource with a calculated column showing one or more holidays for that resource, if any.

++Resource Holidays This Sprint Role++

Name 1 08/14/23 Dev

Name 2 08/14/23, 08/15/23 Dev

Name 3 Lead

Name 4 08/15/23 QA

Edit: I figured out the solution with the updated SQL below, which puts multiple dates on same row, separated by commas. This works well enough, but I still have question on the separator--can I separate using line break/carriage return?

Earlier reading indicated this is not supported, but this Stiltsoft page suggests it is possible (see Adding line breaks section): <https://docs.stiltsoft.com/tfac/cloud/advanced-table-cells-formatting-58426218.html> I tried FORMATWIKI and FORMATMARKDOWN to use a line feed, but it doesn't work.

SELECT  
T1.'Engagement',  
T2.'Resource',  
T2.'Role',

(SELECT GROUP_CONCAT(FORMATDATE(T3.'Holiday Converted Date', '%d %b %Y'))  
FROM T3 WHERE T3.'Resource' = T2.'Resource'  
AND T3.'Holiday Converted Date' BETWEEN T1.'Sprint Start Date' AND T1.'Sprint End Date' )  
AS 'Holidays This Sprint',

T2.'Planned Dev Days',  
T2.'Nights and WEs (Days)',  
T2.'Holidays (Days)',  
T2.'Actual Dev Days',  
T2.'Comments'  
FROM T1 JOIN T2 ON T2.'Engagement' = T1.'Engagement'  
ORDER BY T2.'Resource'


Answers:
author: Stiltsoft support
body: Hi [@Scott Gillespie](/t5/user/viewprofilepage/user-id/5118135) ,

Please try the following SQL query:

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

SELECT  
T1.'Engagement',  
T2.'Resource',

**FORMATWIKI((SELECT SUM(T3.'Holiday Converted Date' + " \\n")**   
FROM T3 WHERE T3.'Resource' = T2.'Resource'  
AND T3.'Holiday Converted Date' BETWEEN T1.'Sprint Start Date' AND T1.'Sprint End Date'))  
AS 'Holidays This Sprint'

<br />

FROM T1 JOIN T2 ON T2.'Engagement' = T1.'Engagement'  
ORDER BY T2.'Resource'

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

Hope it helps your case.

comments: author: Scott Gillespie
body: Thank you very much! I was hitting all around this but had been omitting the SUM function.


author: Stiltsoft support
body: Glad we could help!

The trick was even not in the SUM function but to put the FORMATWIKI before the subquery with the internal SELECT.

Like not SELECT SUM(FORMATWIKI...) or SELECT GROUP_CONCAT(FORMATWIKI...) but FORMATWIKI(SELECT ...). Maybe that's why it wasn't working for you - it wasn't a plain command but a subquery string.


Tags: confluence-server

filter

ms-excel

server

table
Several confluence instances in the same company
Asked by frithjof falck:

I have a question for you experts. Are there any reason to have several confluence licenses within the same company (data center)? E.g. for security reasons?

Or would it be jus as "safe" to have one licenese and let's say several nodes. Both downtime and security considerations.


Answers:
author: Nic Brough -Adaptavist-
body: Hi Frithjof,

I've got many clients who have more than one Confluence system. There are many reasons for it, but the main one is simply that one department has no need to see the documentation that another has generated.

Putting it all in a single instance would be sensible in terms of licencing and maintenance, but that means that there's a lot of noise in the system (I work in department A, I don't care what departments B and C have written) and as Confluence's search function is bad, you would see a lot of people running searches that lands on noise instead of what they need.

comments: author: frithjof falck
body: Good point. I see the problem with the search function. Maybe something you could solve with space permissions.

But that will also mean they have to pay for each instance?


Tags: confluence-server

server