youngmon/atlassian-qna huggingface dataset:
How do I/Should I commit one set of changes to multiple branches?
Asked by Raymond DeGennaro:

I'm not sure the best way to handle this, but I think what I want to do is push one set of changes to multiple branches, or duplicate the most recent changes in multiple branches.

I have one project, that has three separate targets, that (currently) only differ in "branding" (icons, splash screens, messages, etc.) and version number. I just made a large set of changes that only affected shared code, so I checked the changes into origin/master. I'd like the same "snapshot" of code to be in each of the brand-specific branches.

* Can I copy the last commit to origin/master to each branded branch?
* Is my only choice to check-out the code and commit to each branded branch?
* Can I do this a better way?

I'd like to do this using SourceTree (Mac), but I can use the Bitbucket web interface, or raw git commands, if necessary.


Answers:
author: Seth
body: I'm not entirely sure if this will work with your branching strategy, but the ideal solution would be to merge master into each other branch.

If there are other changes to master that you don't want to propagate to the other branches, you can check out each other branch and "cherry-pick" the commit in question (in SourceTree, right-click the commit you want to cherry-pick). <http://git-scm.com/docs/git-cherry-pick>

comments: author: Raymond DeGennaro
body: Ah, didn't think of merging out of master. This will work because there's no unique code between the versions, right now.


Tags: branch

commit
Ignoring proxy settings for internal git server
Asked by Ashley Wilson:

Our organisation has an internal git server, while I need to fetch third-party modules hosted elsewhere on the Internet. To access any external sites, I need to pass through the proxy server. If I enter our proxy settings into SourceTree in Tools -\> Options -\> Network -\> 'Use custom proxy settings' and tick 'Add proxy server configuration to Git / Mercurial' checkbox in the same page, I am able to connect to external git repositories.

However, at this point, I am unable to fetch from our internal git server. I can only fetch from there if I untick the checkbox mentioned above.

So, to be able to use both external and internal repositories at the same time, I need to tell git to ignore the proxy for our internal git server and use the proxy for everything else. Could anyone please tell me how to accomplish this?


Answers:
author: jpkotta
body: [Stackoverflow answer.](http://stackoverflow.com/questions/19523903/how-to-temporarily-disable-git-http-proxy)

Basically, set some environment variables:

export http_proxy=http://proxy.example.com:8080

export no_proxy=".example.com localhost"

And make sure git uses the variables:

git config --global --unset http.proxy

(You may need to also set the corresponding https variable+config).

For an existing repo, you can also set http.proxy on a per-remote basis

git config --local remote.upstream.proxy proxy.example.com:8080

git config --local remote.internal.proxy ""

comments: author: Ashley Wilson
body: Perfect. Thank you, Jonathan!


author: rsperafico
body: Hello Ashley,

Thank you for your question.

```
git config ?global http.proxy http://user:password@domain/reposiroty.git
```

After setting the proxy, please check the configuration by typing in the command:

```
git config ?get ?global http.proxy
```

Please, try (as it shouldn't work)

```
git pull origin master
```

Please, try:

```
git pull http://domain/repository.git master
```

If you find this answer useful, I would kindly ask you to accept it so the same will be visible to others who might be facing the same issue you have inquired.

Thank you for your understanding.

---

Kind regards,  
Rafael P. Sperafico  
Atlassian Support

comments: author: Ashley Wilson
body: Thanks for the response Rafael, but it doesn't solve my problem.. git config --global http.proxy proxy.company.comThe code above would set the global proxy to be used, wouldn't it? That would be the same as using the GUI (Tools -\> Options -\> Network -\> 'Use custom proxy settings'), but that doesn't stop it from being used for my internal git server. You also seem to be pointing to the repo in that command, how does that work?I want to use the GUI to fetch from all remotes, both external and internal, at the same time. This won't work if I can't exclude my internal git server from using the proxy settings...


Tags: git

proxy
Sourcetree rebase without a commit
Asked by jmejiaa1986:

I want to merge a branch but have it appear as 1 commit, without the other branch showing in master.

Right now, I can do a merge and uncheck(commit immediately and check commit even if FF).. This lets me have the commits in my working copy and allows me to create a new commit in master with my changes. But the history still shows the commit on the other branches even after deleting.

I want to do this, but not show the commits from the other branch, so I can keep committing all I want on separate branches but have this be nice and pretty on my master.

Can this be done?


Answers:
author: Bal?zs Szakm?ry
body: I think [this](http://stackoverflow.com/questions/5308816/how-to-use-git-merge-squash) will be helpful.

comments: author: jmejiaa1986
body: Thanks, I tried a interactive rebase with sourcetree and squashed my commits but I noticed a file had some wrong changes included, so I didn't fully trust it.Maybe doing it in command line will give me different results.


Tags: git
How do i export a tag in the source tree???
Asked by zaman:

How do i export a tag in the source tree???


Answers:
author: Seth
body: If you are willing to use the command line, you might be looking for git archive: <http://git-scm.com/docs/git-archive>

You could probably set up a custom action to run that if you wanted.

Whether you prefer to checkout the tag or export an archive really depends on the bigger picture of what you're trying to do.


author: Bal?zs Szakm?ry
body: You need to check out the tag. You can do this by double-clicking the name of the tag in the list. (Between the Branches and the Remotes section in the greyish bar on the left side of the history.)


author: zaman
body: yeh, i am takling about git in window 8i need to all files in a version of project...


author: Bal?zs Szakm?ry
body: Could you please explain what you mean by "exporting a tag"? Also, are we talking about Git or Hg?
Sourcetree and Windows 8: lots of frustrating issues
Asked by Frank Neezen:

Hi everyone,

I waited for a while to actually post this but I would like to resolve the issues I am seeing once and for all since they are oh so frustrating!

I am facing the following problems so I am hoping the community knows what is causing this (I have seen similar threads around so not sure if its been resolved or pending):

1. Sourcetree randomly locks whilst performing my actions. For example: I add my files for commit, it loads, all OK. I add some more files, I get a lock error. I need to manually remove the lock, and continue. Sometimes it throws another lock error, sometimes it doesnt. Sometimes it works for a long time before it locks up again. Is it because I am just clicking through the system too fast? Its really frustrating having to manually remove the lock file and then getting the lock file immediately after.
2. Load times are really slow. When I add files to staging it can sometimes take up to 30 secs to a minute before they show up. Sometimes they do not show up at all and I have to restart Sourcetree to see them in the staging screen. I wonder if its because the staging screen does not refresh properly or there is a lag between ANT and the GUI ?
3. Random freezing of Sourcetree. Our repository is fairly big but not super big that it should have difficulty listing a few files. I face a lot of random freezes though (not sure if related).
4. Any way to disable the compare screen on the right? Sometimes I get the feeling thats the culprit as its quite slow on occasions.

Thanks in advance for your support!

Frank


Answers:
author: fuck atlassian
body: How would i bring attention of staff to this post? I assume you made this forum so every problem slides down quickly?


author: fuck atlassian
body: Absolutely support you, on win 8.1 source tree works with insane lockups and freezes, any action throws it into a freeze. This is completely unacceptable for quality software which makes me wonder why atlassian ignores users?
Modify commit
Asked by apaksoy:

Is there a way to modify an older commit(the files in that commit) without create a new commit?


Answers:
author: Bal?zs Szakm?ry
body: If the commit and at least on later one is already pushed to the server:

The short answer is "no".

The long answer is that it is possible to do this with Git (not SourceTree), but it is rather complicated and all the other users of the repository would find themselves with an incompatible version of the history that they would need to repair afterwards.

The best way to do this is to revert the commit you want to modify and create a new one with the right changes.

If the code is not pushed yet, which seems to be the case:

1. (Stash any uncommitted changes you have.)
2. Do a **soft** reset to the last commit before the commit you want to change. (Right-click on the commit you want to reset to and click the right option in the context menu.) Now all the changes made in the commits above this point are converted to uncommitted changes.
3. Re-create the commit you wanted to edit and all the others after it.
4. (Re-apply stashed changes and continue working.)

comments: author: apaksoy
body: The commit is not pushed. Can it change the answer?


author: Bal?zs Szakm?ry
body: Yes, I updated the answer accordingly.
OSX 10.8.5 update to SorceTree Version 2.0.4 errors with "dyld: lazy symbol binding failed"
Asked by Ben Rush:

I've updated to the latest version of SorceTree Version 2.0.4, but now when I try to launch a repository (osx 10.8.5) I receive the following errors:

```
'git status' failed with code 5:'dyld: lazy symbol binding failed: Symbol not found: ___strlcpy_chk  Referenced from: /Applications/Apps Programming/SourceTree.app/Contents/Resources/git_local/bin/git  Expected in: /usr/lib/libSystem.B.dylibdyld: Symbol not found: ___strlcpy_chk  Referenced from: /Applications/Apps Programming/SourceTree.app/Contents/Resources/git_local/bin/git  Expected in: /usr/lib/libSystem.B.dylib
```

Is there something I can do?

many thanks


Answers:
author: joseph_rossi
body: I ran into this the other night while troubleshooting with another developer. It seems the after version 2.0.5.6, SourceTree is running git version 2.6.2 (<https://www.sourcetreeapp.com/update/ReleaseNotes.html>), which breaks 10.8. I downgraded to 2.0.5.2 for that developer.

I didn't try this, but I wonder if replacing the git_local folder in the SourceTree.app bundle with an earlier version of git, or a version of 2.6.2 built from source would work. Might be worth a try.


author: Andrew Balfour
body: Likewise, just started getting that error today. Mac 10.8.5 running SourceTree 2.0.4. Cleared everything out of \~/Library/Application Support/SourceTree and it still happens trying to setup the first repo.


Tags: mac
Source Tree Memory Leak Windows Server 2008 R2 Standard
Asked by Nathan Keiter:

Let me start out by saying we love Source Tree and have been using it for a few years now. We have a locally hosted Stash Repository we us it with (on a different server.)

We have the latest version of Source Tree installed. This issue showed up in the last few versions, but now it is pretty much unusable.

I'd tell you the version number, but Source Tree isn't responding right now, so I can't check.

When we start Atlassian Source tree, CPU usage by Source Tree climbs to 50%. Memory usage climbs to anywhere between 3G and 7G.

Sometimes if you wait 20 or 30 minutes, the memory usage will fall to around 0.5G and the program will start responding.

We see this behavior on first boot and any time a new commit is pulled in and/or a new commit is available remotely, but not yet pulled in.

If it becomes responsive enough to tell me the version number I'll post it. I've been waiting 45 minutes so far.

Thanks,

Nathan

P.S. Finally got the version. Even the "About" window is not responding...

Source-Tree-Not-Responding.jpg

P.P.S

Downgrading to version 1.5.2 fixed the issue. Barely any memory used now!

Source-Tree-version1.5.jpg

Source-Tree-1-5-2-About.jpg  
[](https://community.atlassian.com/t5/Sourcetree-questions/Source-Tree-Memory-Leak-Windows-Server-2008-R2-Standard/qaq-p/394051?attachment-id=9263){#link_116aa347fb78d5}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/11726/1/Source-Tree-Not-Responding.jpg){#display_116aa347fb78d5_0}  
[](https://community.atlassian.com/t5/Sourcetree-questions/Source-Tree-Memory-Leak-Windows-Server-2008-R2-Standard/qaq-p/394051?attachment-id=9264){#link_116aa347fb78d5_0}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/11726/2/Source-Tree-version1.5.jpg){#display_116aa347fb78d5_2}  
[](https://community.atlassian.com/t5/Sourcetree-questions/Source-Tree-Memory-Leak-Windows-Server-2008-R2-Standard/qaq-p/394051?attachment-id=9265){#link_116aa347fb78d5_1}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/11726/3/Source-Tree-1-5-2-About.jpg){#display_116aa347fb78d5_4}


Answers:
author: Seth
body: This is likely related to this bug. Feel free to vote on it, but I think it's at the point where the devs are aware and just need time to diagnose and fix the issue.

<https://jira.atlassian.com/browse/SRCTREEWIN-2093>

There is a download link to 1.5.x in a few of the comments, which you may try to see if it resolves the CPU/memory usage issues.

comments: author: Nathan Keiter
body: Thanks Seth! Downgrading to 1.5.2 fix the issue! See above for details.


author: Nathan Keiter
body: Guessing it's version 1.6.12? Have the same version on my Windows 7 PC and it's slow at times, but not completely unusable like the one on the server is right now. I haven't been able to do any work on the server since 9:30 AM.I might try downgrading to 1.5.x at this point.
How to add Watcher from unauthorized group to a single article?
Asked by Mary Agueros:

Is it possible to add a Watcher to a single article who is from a group not authorized to view space? I want to give the single user privilege to view one single article not the entire space.

* I tried using the Manage Watchers modal on the single article itself
* I tried using the Restrictions on the single article itself

Based on my observations, please confirm that the only way to provide view privileges is to add the Confluence Group the single user is a member of to the Internal Licensed User\\Groups **or** add the single user to the Internal Licensed User\\Individual Users lists located on the Space Permissions page.

Regards

Mary


Answers:
author: Sayed Bares [ServiceRocket]
body: [@Mary Agueros](/t5/user/viewprofilepage/user-id/5067651) When adding watchers make sure that they have view permission to the space and page you want to add. You **don't** have to add the user's group to grant **ALL** of them space view permission. You can do that in an individual level ([Add people to your space](https://support.atlassian.com/confluence-cloud/docs/assign-space-permissions/#Add-people-to-your-space)) and only add the user who you want to become the watcher.

You may use [Page restrictions](https://support.atlassian.com/confluence-cloud/docs/add-or-remove-page-restrictions/) for other pages which you don't want the user to have access to.

comments: author: Mary Agueros
body: Thank you Sayed for confirming my observations. Yes, I have added individuals to the space as View only and then applied restrictions. I posted my question on the off chance I had missed during my research a feature which would allow me to add individuals to one single page with View permissions.

Extending a second thank you to you and the other community leaders for your prompt and concise answers/feedback.


Tags: cloud

confluence-cloud
Synching Trello and Atlassian calendars
Asked by Natalie Yahnke:

Is there a way I can create a rule so a calendar in trello or a card insert in trello can automatically show up or synch in a board in Confluence calendar? We have confluence for our company but we don't all have a trello license and we want to set it up where we enter something in Trello and it auto populates as an event on a calendar.


Answers:
author: Brant Schroeder
body: [@Natalie Yahnke](/t5/user/viewprofilepage/user-id/5281351) Welcome to the Atlassian community

Once you get the Calendar Power-up set up on your board you can get the iCal feed for the board. This can be used with any calendar application including the Confluence calendar. Here are some help articles that can help you out with both getting the iCal feed from Trello and adding it to your Confluence calendar:  

* [Using the Calendar Power-up](https://help.trello.com/article/811-viewing-cards-in-a-calendar-view)
* [Add other calendars to your Confluence calendar](https://confluence.atlassian.com/teamcal/create-add-and-edit-calendars-654213559.html#Create,Add,andEditCalendars-Addothercalendars)


Tags: cloud

confluence-cloud
Re: Re: Updates and Q&A on active incident affecting Atla...
Asked by LiangHu:

My confluence page is down for the whole day. Could anyone check [@Stephen Deasy](/t5/user/viewprofilepage/user-id/96934) ?

My confluence link is <https://barclaysjira.atlassian.net/wiki/spaces/IL/overview>


Answers:
author: Stephen Sifers
body: Hello [@LiangHu](/t5/user/viewprofilepage/user-id/5284442)

There are currently no outages or incidents at the time of posting. More on this may be found in <https://status.atlassian.com/>

We would suggest working with your site administrator to understand the access problem you're facing. Your site administrator may also have insights into why you can't access your Confluence site or may have already contacted support to have the matter resolved.

Regards,  
Stephen Sifers
Creating template from Root of space
Asked by Philip Penrod:

Hello,

We used to be able to create templates and add them to the root directory of the space. We should use the "_" in front of the template and it would allow you to create a template with Child pages.

Since moving to the cloud, this appears to be broken. No templates load when you select "Document from template" option.

Any idea how to fix this or work around it? We need to create a lot of pages that have 5 child pages that are all formatted the same. Very time consuming without this feature working.


Answers:
author: Dave Wuensch _Decadis AG_
body: Hello [Philip,](https://community.atlassian.com/t5/user/viewprofilepage/user-id/3187163)

therefore, I can recommend our App [Space Tools Pro](https://marketplace.atlassian.com/apps/1225522/space-tools-pro-for-confluence?hosting=cloud&tab=overview). Check it out and if you are interested, contact. With the app you can create new pages, copies of pages and spaces and create pages from templates.

If you have question, get in touch with me.

Cheers  
Dave


Tags: cloud

confluence-cloud
Will Atlassian ever make Confluence at the organisation level available?
Asked by Elaine McMillan:

We have several Jira instances all of which will soon be under a single organisation and we would like to be to avail of the tight integration to confluence for our JSM (for the knowledgebase) and Jira (for project pages) projects across all the instances. To this end do Atlassian ever intend to have confluence available at the organisation level capable of acting as a documentation resource to all Atlassian products from one place?


Answers:
author: Aron Gombas _Midori_
body: I am not 100% sure if I correctly interpret the question, but you can already add multiple Atlassian Cloud sites to the same organization. And, on one site you can have Jira, Confluence, other products.

Therefore to me it seems possible to have Confluence (one or more) available for the organization.

See: <https://support.atlassian.com/organization-administration/docs/add-a-new-product-to-your-organization/>


Tags: cloud

confluence-cloud
The confluence page is down
Asked by LiangHu:

Hi the community of confluence,

Our team confluence is down for all day. Could anyone give me some feedback?

<https://barclaysjira.atlassian.net/wiki/spaces/IL/overview>


Answers:
author: Robert Wen_ReleaseTEAM_
body: Global status of Confluence as shown on <https://status.atlassian.com/> shows that Confluence is up (I can work on my own Confluence instances).

I'd answer [@Dave Mathijs](/t5/user/viewprofilepage/user-id/2662590) 's questions. Are we sure that this has worked before?

Another thing to consider: if you haven't been using the Confluence site for a long period of time (6 months comes to mind), they disable the site.

comments: author: LiangHu
body: Everything works until yesterday. This shows Your Atlassian Cloud site is currently unavailable. Please check [Atlassian Status](https://status.atlassian.com/) for known problems.  
If there are no known problems and your page hasn't appeared again in 5-10 minutes then please contact our support team.


author: Dave Mathijs
body: Hi [@LiangHu](/t5/user/viewprofilepage/user-id/5284442)

welcome to the Atlassian Community!

Are you on a Free or Standard Plan for Confluence?

Have you tried contacting Atlassian Support directly?

comments: author: LiangHu
body: Yes, I am on the free Plan. what is the phone I can directly get support?


author: Dave Mathijs
body: You cannot phone Atlassian, you need to click on the grey Contact Support button. But since you are not on a Standard Plan, you may not be entitled to direct support.

* Has it always worked before?
* Is this the first time this is happening?
* Are you a Site Admin or Org Admin?


author: LiangHu
body: This is the first time for us to meet this issue. Is there a way to upgrade a standard plan ?


author: Robert Wen_ReleaseTEAM_
body: If you are the Organization Admin, you can go to the Administration page (admin.atlassian.com) find the free subscription for Confluence Cloud and Upgrade to Standard or Premium.


author: LiangHu
body: I am not a org admin. Is there a way to know where can I get all of my doc.


author: Dave Mathijs
body: You'll need to contact the Org Admin first.


author: Sumit Uniyal
body: Hi [@LiangHu](/t5/user/viewprofilepage/user-id/5284442)

Your Confluence site **barclaysjira.atlassian.net** has been deactivated as the subscription was not renewed for the site by the Billing contact.

Please contact the Org/Site Admin to check for renewal of the subscription.

Regards,  
Sumit


author: LiangHu
body: Hi [@Sumit Uniyal](/t5/user/viewprofilepage/user-id/4928440) ,

When I log back in, I even can't see my workspace <https://barclaysjira.atlassian.net/wiki/spaces/IL/overview/>


author: Dave Mathijs
body: [@LiangHu](/t5/user/viewprofilepage/user-id/5284442) Please follow the suggestion from [@Sumit Uniyal](/t5/user/viewprofilepage/user-id/4928440) in this case and contact the Org/Site Admin to check for renewal of the subscription.


Tags: atl-rvw

confluence-cloud

feedback-forum