youngmon/atlassian-qna huggingface dataset:
Problems continuing a rebase after resolving conflicts in SourceTree.
Asked by rMarkD:

I am attempting to Cherry Pick a series of commits from my development branch into a hotfix branch. On the 5th commit, there were conflicts in one of the files. I resolved the conflicts (Resolve using "Theirs") and then attempted to commit the now staged changes. Sourcetree helpfully recognized that I had been in the middle of a rebase and asked if I wanted to continue. When I said yes, it attempted to but couldn't, saying "It looks like git-am is in progress. Cannot rebase.". Is there any way to handle this in SourceTree? I get the same message when I try to abort the rebase. Thanks.


Answers:
author: Magnus Bondesson
body: As I understood, you did these steps (within SourceTree (ST), but I will examplify with git commands):

git cherry-pick c1 (c1=commit 1)  
OK (a commit was automatically created by Git)

git cherry-pick c2  
OK

git cherry-pick c3  
OK

git cherry-pick c4  
OK

git cherry-pick c5  
Conflict!  
You fixed conflicts, staged them and tried to:  
git commit  
ST saying something about you being in middle of rebase...

Did I understand you correctly?

At what time did you start rebasing and why?

Btw, there is another bug in ST related to this where the commit msg is not filled in correctly (it's empty) after a conflict when cherry-picking (same after a conflict when reverting). I reported it here: [](https://jira.atlassian.com/browse/SRCTREEWIN-570)<https://jira.atlassian.com/browse/SRCTREEWIN-570>

/Magnus
purpose of shelve, fetch and HG Flow
Asked by kavi arasan:

Hi all,

source tree is new one for me

what is the functionalities or purpose of 'Shelve', 'fetch', and 'HG Flow' in the tool bar of source tree work bench?


Answers:
author: Seth
body: I'm not sure what "Fetch" means, as i use Git, and brief research suggests it is NOT the same as git fetch.

"Shelve" will take a snapshot of your current changes and store them in a small package separate from any commit or branch, then will clear those changes from your working copy. The "shelved" changes can later be re-applied to any branch (including the one you originally shelved from). This is most often used to temporarily get local changes out of the way in cases where you aren't ready to commit, but you want to pull changes from a remote.

HG Flow is a tool to streamline an OPTIONAL workflow. You can find out more about this workflow here: <https://andy.mehalick.com/2011/12/24/an-introduction-to-hgflow>

comments: author: kavi arasan
body: Hi Seth Foss,

sory for late reply Foss. your information is helpful for me.

i have a another question. why below notification is occur when work with git

![](../../upfiles/q.png)

and also when i try to first commit to the git repository, the index error is occur why? what is index and how to create it?


author: Seth
body: Your loose objects dialog is from Git Gui, not SourceTree, so this isn't the best place to ask the question. I did find an answer [on StackOverflow](http://stackoverflow.com/questions/5709687/what-are-the-loose-objects-that-the-git-gui-refers-to).

Also, I can't answer your question about the inde error without more information. What is the error message?
Sync 2 peer repositories with SourceTree
Asked by David Hou:

I remember when I worked on commend line git over Linux, I was able to sync my repository with a peer repository for, say, integration testing before both of us push to the central or origin git repository. Can I do similarly with SourceTree? If so, is there any resources documenting how?


Answers:
author: Seth
body: Git is designed to be de-centralized. All non-local repositories (central or peer) are "remotes". You should be able to add the peer repository as a remote using the parameters you used for connecting with command line.

comments: author: David Hou
body: So one can't do so via the GUI? And such use case can only be done via command line?

My actual use case is syncing my Mac with Windows 7 repository which has VPN access to the remote origin (yep, my Mac has no VPN). How do I get git command line on Windows 7? \[UPDATE: never mind about command line, I see the icon on the toolbar...\]


author: Seth
body: Yes, you can use the GUI to add remotes. Under the repository menu, go to "Add remote...". In push/pull menus you'll have the option of which remote to use for the operation. It should default to origin.


author: David Hou
body: Seth, thanks for responding. Since I can't find any useful documentation on SourceTree, can you possibly give me the steps using GUI to...

1) Share a local branch to peers

2) Formulate the connection string to access the local branch for a peer to add a remote

Thanks!
fatal: You are in the middle of a merge -- cannot amend.
Asked by diarybooker-admin:

how do i resolve this? as far as I know I have resolved all conflicts, i just need to complete the merge and commit the changes. but the product wont let me and doesnt give me any clues as to what I am meant to do next!


Answers:
author: diarybooker-admin
body: Turns out not selecting "amend last commit" was the solution...


author: nehemiah jacob
body: ```
rm .git/MERGE_HEAD
```

Should do the trick !
where is the product documentation for Tree source?
Asked by Stephen Kennedy:

There seems to be no documenttion of how to use tree source. Where is hte help pdf or read me?


Answers:
author: KieranA
body: Hey Stephen,

If you're on the Mac you can use the Help \> SourceTree Help menu. On Windows we're still playing catchup with the documentation and hope to get more online documentation out there in the coming months.

Thanks for your patience
Where does SourceTree store its settings on Windows?
Asked by Dan Jackson:

Our Computing department uses GitHub in their computing courses, but we have had difficulty with using the official GitHub for Windows client in that there is no way to control where it saves settings as it uses ClickOnce, so we are looking at alternatives, of which SourceTree is one.

On Windows, can SourceTree be installed for all users on a PC, and if so, where does it store its settings? Our students have fixed mandatory profiles, so ideally we would like for settings to be storable in a file in their network home folders.

Thanks,

Dan Jackson (Lead ITServices Technician)

Long Road Sixth Form College

Cambridge, UK


Answers:
author: Ryan Horrisberger
body: duplicate question see:

[](/questions/306304/where-does-sourcetree-store-repository-configurations)<https://answers.atlassian.com/questions/306304/where-does-sourcetree-store-repository-configurations>

and also bug report:

[](https://jira.atlassian.com/browse/SRCTREEWIN-2135)<https://jira.atlassian.com/browse/SRCTREEWIN-2135>


Tags: configuration

profile

windows
git-http-push.exe error: libcurl-4.dll is missing from your computer
Asked by Andr? Barbosa:

Hi,

I have used Sourcetree for a while now and it has always worked flawlessly, but today whenever I try to push something I get an error stating that libcurl-4.dll is missing.

I am on Window8 x64. Latest version of Sourcetree and Git and I have tried re-installing, rolled back Windows 8 and it is still present.

Can anyone help?

Thank you.


Answers:
author: Andr? Barbosa
body: For anyone with the same issue, I had to manually copy the libcurl.dll file to "C:\\Program Files (x86)\\Atlassian\\SourceTree\\tools" and re-name it to libcurl-4.dll...

Don't know what caused it, but this worked.

comments: author: thomasdeneux
body: Thank you, this also worked for me! In my case, the liburl.dll to be renamed into libcurl-4.dll was in C:\\Users\\\[Me\]\\AppData\\Local\\Atlassian\\SourceTree\\git_local\\bin


author: Andr? Barbosa
body: I've now tried both embedded GIT and standalone version (1.8.3 for both) and nothing...


author: Andr? Barbosa
body: I am using embedded GIT


author: Andr? Barbosa
body: I am using embedded GIT


author: Seth
body: Are you using SourceTree's embedded Git or a standalone version?
Permission denied when trying to pull
Asked by Leonel:

I have Sourcetree installed on my Mac OSX and it's running smoothly on my machine.  
I'm trying to help a co-working resolve an error she's getting when using Sourcetree.

When she clicks the Pull button, she gets a **fatal error: cannot create directory Permission Denied**. See attached image.

The error doesn't seem to be related to the SSH keys. She can do git push, but not git pull. Every time she needs to pull, she has to do it through the Terminal using sudo.

How can we fix the error?

![](../../upfiles/sourcetree-permission-denied_1.png)


Answers:
author: Seth
body: Check ownership/permissions on her local directory.

comments: author: Leonel
body: If I change the permissions of her local directory, wouldn't that change the permissions on the repo?


author: Seth
body: It might, but if her user isn't allowed to write to those directories/files, SourceTree won't be able to pull.


author: Leonel
body: Had to change the permissions of the "staff" group for that directory to Read/Write

comments: author: Seth
body: So I don't get any credit for helping you figure this out?


Tags: moderators
Sourcetree v1.4.1 and Hipchat on Windows 7 crashing on launch
Asked by nknganda:

Hi Guys,

Sourcetree Windows v1.4.1 and Hipchat crashes on launch every time I open it, the gui does not even show.

Seems Windows might have corrupted a file that Atlassian uses for both applications.

Please help.


Answers:
author: Jacob Whetstone
body: I found the solution to my problem, perhaps it would work for you too.

The answer was to fully uninstall and re-install my graphics drivers.  

I don't know why something as general as graphics drivers would only be affecting certian applications, but there it is.


author: Jacob Whetstone
body: I think I probably have the same issue, although HipChat was not affected on my machine.  

I didn't see this thread when I was creating my issue.  

Details here:  
<https://answers.atlassian.com/questions/269372/sourcetree-stopped-launching-win7>


author: Jeff Thomas
body: You may want to drop a line at [](https://support.atlassian.com/)<https://support.atlassian.com/>they should be able to help.

Are there any crash logs in the Windows Event Viewer for HipChat or SourceTree?

Event Viewer \> Windows Logs \> Application


author: nknganda
body: Yes, all were working yesterday. Maybe my windows is corrupt.


author: Jeff Thomas
body: Interesting, I have several files in there and no user.config. Have you tried reinstalling both applications? Did they both work in the past?


author: Jeff Thomas
body: Could you post your sourcetree.log file? It's located in %USER%\\AppData\\Local\\Atlassian\\SourceTree


author: nknganda
body: Can't find the log file in %USER%\\AppData\\Local\\Atlassian\\SourceTree just a user.config file.


Tags: hipchat

windows
Git is failing to Stage, or commit with SourceTree in a Windows network environment
Asked by vr_driver:

Hello, I'm using Atlassian SourceTree to look after some git repositories, however when I create a new one and try to add new files for the first time (not sure if it's essential info for getting help), but this is the error message I get when I try to commit a file:  

git -c diff.mnemonicprefix=false -c core.quotepath=false add -f -- app/file.txt  
error: unable to create temporary file: File exists  
error: app/file.txt: failed to insert into database  
error: unable to index file app/file.txt  

fatal: adding files failed  

Completed with errors, see above.  

<br />

It's a little annoying, because it's not storing anything.  

I'm doing this at work under a Novell/Windows environment, so it could be a permission error, but I figured if I'm browsing the network and logged in as me, surely the SourceTree internal git program would store and look at the network as to who it's logged in as.  

It works great if I'm using a source directory locally, but it doesn't work on a shared path.   

Are there any git/SourceTree boffins out there experienced this problem?  

<br />


Answers:
author: vr_driver
body: Looks like it can't be done. So instead I'm working on a local git repository, and copying the entire path. Not the best method. But it'll at least let others still see the files (who don't have git access)

comments: author: Adrian Moerchen
body: What do you mean with "shared path", a network drive? Also "git init" seems to have worked prior, so the rest should work as well.

As SourceTree just calls an embedded cmd git you may try this out directly on the cmd or just try to use TortoiseGit.

There is also a [similar questions](/questions/104657/source-tree-often-fails-to-commit). To make it short: try to configure SourceTree to use the "normal" downloaded git instead the embedded one.


Tags: git
SourceTree refresh all repositories status
Asked by d3bgger:

hello

I have a question for sourcetree.

Coming from tortoise svn, i'm used of seeing green checks in all my local repo folders, and rest assured that there is no change in all of the repositories i have checked out.

Now with git and sourcetree, i assumed that the left pane showing the list of all the cloned repositories, is getting refreshed (all of them) each time i press f5 (Not all the information of line diffs etc, just the indication of clean or not). But on the contrary only the currently open tab repository is getting refreshed.  

So in other words, if i have cloned 50 repos, and want to be sure that i haven't forgot to commit or push anything over time, i have to open each of these repos in a tab to actually see the real status.   

I'm i missing something here?

This seems tedius, and i wouldn't like the idea to install a shell extension just for that missing feature...  

thanks in advance


Answers:
author: Seth
body: That fits with the desgn of Git/HG. They are designed to be local repositories that can push/pull from remotes. Unlike SVN, it is prefectly valid to have a Git deployment that doesn't have an origin at all, or to make significant use of local-only branches, or to have branches that track remotes other than origin. It would be a faulty assumption on Atlassian's part to assume that every branch should be tracking origin, even if you cloned a repo from there.

Additionally, it isn't required to have a master branch, that is just a common naming convention (unlike centralized versioning systems, which always have a "trunk").

Instead of assuming that Git is basically like SVN, but newer/cooler/better, you should read (or at least skim) the [book](http://git-scm.com/book) (free, online) and see the foundational differences between the two.


author: d3bgger
body: another thing i noticed, is that if you clone an empty repository, and create the master branch and commit to it locally, there is nothing to remind you that you must also push to origin. In order to get a push reminder, there must be a branch in origin also!


author: Seth
body: There is an option to automatically refresh remotes every X minutes. In Windows, this is in Tools \> Options under the General tab. This will effect all bookmarked repositories.

Also, with Git there are two different states that were just one in SVN. A green check by the repo bookmark means that your working copy has no changes compared to whichever branch is checked out in your **local** repository. Differences from the **remote** repository are labelled with green arrows (up or down). A down arrow means you need to pull changes from remote, an up means you need to push changes to remote.
How to clone and push a Git repo upstream using SourceTree?
Asked by Mike Wirth:

Hi, folks,

Git, Atlassian, etc., newbie here. Have a "working" Git repo on my Win7 PC (actually a Parallels VM running on my Macbook Pro :-) which I created and to which I have been adding commits using the SourceTree app. So far, so good. But how do I:

1. Clone it to the "cloud", i.e., copy to Bitbucket?
2. Make the appropriate settings and linkages so that the Bitbucket clone is the "Master" and, when I commit further changes locally on my PC, I can "push" them manually or automatically to the Master?
3. How do I share access to the Master, so that I can allow another Atlassian account holder to create a clone on their local machine, and push/pull changes? (I imagine that this item is "standard" enough that you can just point me at a section of the docs or tutorials for how to accomplish it.)

Asking for help here because I found the following items confusing (and you can take their clarification as desired enhancements to the product.)

1. The online tutorials for command line Git operations and usage scenarios were useful, but didn't find any written in terms of SourceTree and it wasn't obvious in some cases how to directly connect one with the other.
2. I'm not very clear on how Atlassian accounts and your various products relate to one another, and how they interoperate. Is there an overview document that describes this?
3. Have some questions on holding multiple accounts. I'm sending this question while logged into my "personal" account (i.e., with my personal email address in my profile). I also *should* have a commercial account (i.e., with another email address and domain name, part of the Atlassian account for that domain holder). But my second (commercial) email address isn't recognized by Atlassian, even in the "Forgot my password" procedure. Maybe I'm confusing the two. (Will try to sort this out with the commercial account holder.)

Thanks for any enlightenment :-)

Mike


Answers:
author: Seth
body: Once you have a bitbucket repository, there is a prominent option on the repo dashboard to invite other users.


author: Seth
body: That is a lot of questions seeking a lot of different answers. I am addressing the first 2 in your first set of 3, which boils down to: "How do I get my existing repository into the cloud and linked with SourceTree?"

1. Create a new repository in BitBucket.

2. Click the link to "I have an existing project to push up". That link will give you these commands to run locally (will include your specific remote url):

```
cd /path/to/my/repogit remote add origin https://user@bitbucket.org/owner/repo.gitgit push -u origin --all # pushes up the repo and its refs for the first timegit push -u origin --tags # pushes up any tags
```


Tags: clone

git
sourcetreeapp.com down
Asked by kriegaex:

The homepage for SourceTree seems to be down. I cannot reach it from several networks in Germany. This site also reports it as down: <http://www.isitdownrightnow.com/sourcetreeapp.com.html>


Answers:
author: KieranA
body: Hi Alexander,

We've raised a support ticket with the hosting provider to get this resolved as soon as possible.

Thanks for your patience


Tags: website
SourceTree: Pull all Projects
Asked by Zsolt Szilagyi:

Hello,

I use SourceTree to locally backup my work done on various servers. So basicly I would love to pull all projects with a single click, instead of opening every single project.

Is there an option I missed?

Thanks!


Answers:
author: Seth
body: I don't know of any such option, and I expect that the developers will be hesitant to add it since Pulls can sometimes result in merge conflicts. It is important for most users to be able to see the result of their pull in that case so they can get the conflict resolved.
Am I doing merge wrong? History is lost
Asked by Frode Nilsen:

A week ago I started a new branch in SourceTree by clicking the big Branch button, selected "New branch" and gave it name "#375". I then did a handful of commits before merging into the master branch by following the following procedure:

1. Checked out the master branch
2. Merged branch #375 into master branch
3. Committed and pushed

Se image below. Why do I not see the blue line splitting into two lines at the "original branch point", and then being merged into one line again at the "merge point"?

I'm fairly new to both git and SourceTree, but I'm familiar with mercurial hg, in which this procedure was trivial. I was expecting the same procedure to work here. Help?

![SourceTree screenshot](http://i.imgur.com/D10tEX0.png)

\*\*Edit\*\*: I realize I haven't done any commits on the master branch in the meantime, which may be the cause for it being invisible. Yet I'd still like to know the point at which I started branch #375 for historic reasons. For instance if I want to rollback the feature represented by this branch.


Answers:
author: Frode Nilsen
body: The problem was solved by checking "Create a new commit even if fast forward is possible"

![](http://data.nilzorblog.com/forumposts/merge-confirmation.png)

comments: author: Seth
body: Good call. I guess my work repo is active enough that fast forwards are never possible expect when I'm pulling.


author: Seth
body: It looks like you checked the "rebase" option which re-writes your history to make it appears as though all the commits from one branch (#375) were made directly to the other (master).

To fix you history, checkout master and do a hard reset to the original branch point. Then run the merge again, and make sure NOT to rebase.

comments: author: Frode Nilsen
body: Actually it was as simple as checking "Create a new commit even if fast-forward is possible", but your answer lead me on track so thanks.
SourceTree for educational use
Asked by Mikael Svahnberg:

Hi,

I recently discovered that the university at which I am working does not have any git client for the students to use. The IT service department asked me to suggest a client that they may install on the university network, but they also need some assurances regarding licensing. I gather that you request users to register for SourceTree after 30 days, but it is unclear if the same process would apply when installing for an entire university?

Moreover, what would an academic license cost?

/Mikael


Answers:
author: Seth
body: SourceTree's license is free for both Personal and Commercial use. To streamline license installation, check out the [knowledge base](https://confluence.atlassian.com/display/SOURCETREEKB/SourceTree+License+For+Corporate+Usage).

comments: author: Mikael Svahnberg
body: Thanks. That ought to be enough to convince them.
Where do I see the total number of Licenses I have?
Asked by Jolene Rosario:

I am trying to figure out how many licenses I have. I tried checking for it on General configuration and I was expecting to see License details on the left side but I don't see it. Is there any other way to find the info out?


Answers:
author: Valerie Knapp
body: Hi [@Jolene Rosario](/t5/user/viewprofilepage/user-id/4406521) , thanks for your question.

This view is available only if you have org admin permissions, at the organization level, like this -

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

It might be that you need to ask someone who has this permission to check for you.

I hope this helps.

Cheers

comments: author: Jolene Rosario
body: Hi Valarie,

Thanks for you response.

I do have that view but it only gives me the users and not how many licenses are pending like you can see in the screenshot below. Any advice how I can get that information please?

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


Tags: cloud

confluence-cloud
How to disable functions under "more actions" for a space/ site (like PDF Export) for anonymous user
Asked by Judith Shiferaw:

I would like to make a space accessible to anonymous users, but I'm unable to disable the functions under "more actions" and hide the author or page owner. I can't find an option for this in the space settings.

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


Answers:
author: Sayed Bares [ServiceRocket]
body: Welcome to the community [@Judith Shiferaw](/t5/user/viewprofilepage/user-id/5192886) !

I am afraid to say it is not possible at the moment to disable export option for pages.

Read access and Export options are tied together. If someone has read access then they will also have ability to export the page.


Tags: cloud

confluence-cloud