youngmon/atlassian-qna huggingface dataset:
Failing to show incoming changes on pull request (abort: authorization failed)
Asked by Christian K. Ibsen:

With my current repository configuration, I can push changes to my Bitbucket repository just fine. Userid and password is specified for "default" in my repository settings.

However, when I try to pull, "Incoming changes" result in "abort: authorization failed".

If I expand "Advanced" and select "Branch: default" my pull request completes succesfully!

But I can't see incoming changes.... how come?


Answers:
author: stevestreeting
body: Are you embedding the username AND password in your remote URL? If so, you shouldn't do that, it's very insecure (SourceTree stops you doing it in fact, at least if you created the remote in SourceTree). It's possible that during a deconstruction / reconstruction of the URL that's gone wrong somewhere - it should strictly work, and I'll check that, but it's still very strongly advisable not to include the password in plain text.

If you omit the password (leave the username@ in though), SourceTree will prompt you for it and offer to store it in your keychain for future use, which is vastly more secure.

comments: author: Christian K. Ibsen
body: Right! I had specified \<username\>:\<password\> in my .hgrc file. Leaving out :\<password\> and letting SourceTree store my password in the Keychain fixed my issue :-)
merge problems with GIT using sourcetree
Asked by Summer Schulz:

My company just recently started using GIT instead of SVN so we are not completly used to how the process goes. We are using source tree as our client.

Our problem is that, one of us will be working on the project and push at roughly the same time someone else commited. When they try to push, they are always made to merge even when they changed nothing that had to do with the other persons push. The merge results in them having to commit and push the other persons work (something I do not understand at all) and often results in a lot of lost work.

Our project is in Unity, which adds to diffuculty, but any help would be appreciated.


Answers:
author: stevestreeting
body: This is typical for DVCS - it's because you can commit whenever you like, and have to resolve any case where others have pushed first by either merging or rebasing. If you didn't unify those streams of commits, you'd end up with diverging lines of development. In svn, merge is implicitly part of 'svn update' when someone else committed before you, but it has the disadvantage of possibly messing up your clean working copy if there's a conflict.

When you pull, Git will often automatically 'fast-forward' your commits meaning that you don't need to explicitly merge. If this doesn't happen, then you will need to merge or rebase. Merging is often automatic if there are no conflicts, but you still have to perform it. There is another option, which is to rebase - you can only do this if you have not pushed your own local changes to anyone else yet (with Git you can push commits to places other than the shared primary if you wanted), and what it does is basically alter your commits \*as if\* they were committed on top of the other person's changes, instead of in parallel, which means you don't get any explicit merge or any separate lines of development in the log - everything looks linear. It's worth bearing in mind that you have to be a little more careful with conflict resolution in this case, because you're altering the original commits; when you merge, the original commits are retained so if you make a mistake when resolving conflicts, the original change is still there. Rebase is therefore a lot like 'svn update', which itself performs a merge in-place and can mess up your pending changes if you're not careful. So it's up to you which you prefer - rebase to keep the history linear, or merges to keep the history unaltered from your original commits.

comments: author: stevestreeting
body: I should have pointed out that 'rebase' is available in a few places:

* Preferences \> Git \> Use rebase instead of merge by default for tracked branches
* In the Pull dialog, 'Rebase instead of merge'
* Right-click on a branch in the sidebar, or a commit in the log and select 'Rebase...'.
Does SourceTree works with SVN?
Asked by Paulo Henrique Godinho da Silva:

I cant add a SVN repository created by TortoiseSVN in SourceTree. It gives me the following error "The selected path is not a git/mercurial repository";


Answers:
author: MikeL
body: SourceTree only can freshly check out from a SVN server, but is not able to reuse an SVN working copy. The reason is, that Sourcetree does not use SVN but Git to manage the files locally.

comments: author: Paulo Henrique Godinho da Silva
body: Thats what i'm trying to do, add a just created SVN Repo, what i'm missing?


author: stevestreeting
body: You can enter any valid Subversion URL in the clone box, in order to clone a Git/Mercurial repository from SVN and interoperate with the SVN server over time if you want. You can't, however, add a SVN checkout.


author: Martin Tomes
body: I am running SourceTree on Windows and it doesn't detect a Subversion repository, this is what I see:![SVN detection failure](https://dl.dropboxusercontent.com/u/1089495/svnfail.PNG)
How to commit one file at a time
Asked by cyberpunkstudio:

Just started using Source Tree. Finding it slightly confusing, there's no documentation anywhere telling you how to use this. Be helpful if there was.

When I added files to be staged in the index, how do I commit just the individual files? Because when I try to commit one file out of the host of files in the index it tries to commit the whole lot. I just want to commit the one. But I still want all the other added files to sit in the index for now, so I can add personal commit comments to each single file or multiple lot.

Also is it possible to add and commit a file that is not yet added in one go?


Answers:
author: stevestreeting
body: A couple of ways to do this:

1. Right-click a single file (or indeed any file selection) and select 'Commit'
2. Open the commit dialog any way, and change the 'Commit mode' to 'Commit all changes from selected files in the working tree'. Check the files you want to commit (staging doesn't matter) and click OK.

comments: author: stevestreeting
body: Also note that if you don't like to use the staging mode of committing in git, go into Preferences \> Git and uncheck the box 'Use the staging area'. From then on the commit mode will always be based on selected files and not the staged changes.


author: cyberpunkstudio
body: unchecking 'Use the staging are' worked perfectly. Now I can commit individual files where before all files in the staging area gets committed altogether and no way of unticking them.

<br />

Thanks


author: MikeL
body: Git allows to commit certain files, even if they or others are staged.


author: tier-0 grump
body: It's not really a SourceTree problem here - if a file is staged in git then it gets committed. If you only want to commit one file,than only add that file - if you've already added the file to staging then remove them form the staging area using the remove button before pushing.

i don't use sourcetree often, so don't know the answer to your second part.

comments: author: MikeL
body: Git allows to commit certain files, even if they or others are staged.


author: cyberpunkstudio
body: Yes exactly Git allows you to commit certain files even if they're not staged. But how the hell do you do this in Source Tree??!


author: MikeL
body: I haven't found a way to do that with SourceTree. But with smartGit.


author: cyberpunkstudio
body: Can't believe this killer app can do so many things yet can't do a simple job of just committing individual items.
sourcetree: SVN hoster
Asked by Rene Lamontagne:

Hi,

looking at your sourcetree web page, I see that it points to bitbucket git hoster.

Unfortunaly DreamWeaver does not support git, only SVN.

Do you recommend a specific SVN hoster?

What SVN protocol does sourcetree supports?

Regards

Ren? Lamontagne


Answers:
author: stevestreeting
body: SourceTree supports Subversion servers, but only when cloning to local Git or Mercurial repositories (so you interoperate with SVN). If you need to use SVN locally then SourceTree isn't for you.
Can not Upload a project to a GitBucket repository?
Asked by Mark Linthicum:

I am new to this app, i set up a repository on Bitbucket. In the youtube video it showed how you can drag your local folders into the Bookmarks window and they are added to the repository but this does not work for me. The file does not stick

i think i have done everything correctly, I have my account set up on bitBucket, I see it when i click hosted Projects but it is empty?

Sorry for the newby question, i am not a programer.

Any help would be apreciated.

Thanks, Mark


Answers:
author: stevestreeting
body: You can only drag folders that are already git/hg repositories into the bookmarks window. To create a new git or hg repository in your source folder, use the File \> New option, pick the 'Create Repository' tab and point it at your source folder. You will then need to add the files you want to be tracked and commit them.

As for the Hosted Projects window being empty, you probably haven't created any repositories on Bitbucket yet (just creating an account gives you the ability to create repositories, but doesn't create any for you). You can either create a project via the Bitbucket web interface (Repositories \> Create Repository), or if you've set up your Bitbucket account in SourceTree already then you can create one from the Hosted Projects window using the 'Create New Repository' button in the bottom left. The best way to do this is to do it at the same time as setting up the remote for the local repository you created above - once you've created the local repo, click on the 'Settings' button on the toolbar, click 'Add' in the remotes section, check 'Default remote', then click the 'Globe' button, which will open the Hosted Projects window. You can click the Create New Repository button here, then after it's created just pick that new Bitbucket repo entry to use as your remote. You can then push your commits to this Bitbucket repo.


author: Mark Linthicum
body: Thanks Steve, i will see if i can follow your instructions.

Mark
How do you select a system git installed by homebrew at /usr/local/bin/git?
Asked by Steven Mitcham:

I'm using a homebrew installed git version that is at /usr/local/bin/git but I can't select this in the browse window for setting the system git.

How can I select this as my git option?


Answers:
author: Steven Mitcham
body: Ok, it was related to hidden files. By following the instructions here: <http://www.brooksandrus.com/blog/2007/03/23/mac-os-x-show-hide-hidden-files-in-finder/>

I was able to get SourceTree to see the /usr folder and select the correct version of git.


author: Insomniac Software
body: Sorry to bring up an old thread but just wanted to let you know of a trick to help out here that most users don't know about.

You don't need to show all the hidden files per your linked instructions. Instead, when you click on the "Use System Git" button which brings up the Open dialog window, press the / key, as if you were typing /usr/local... This will show a dialog sheet asking you to manually enter a directory. If you can remember the Cmd-Shift-G shortcut (as Steve Streeting mentioned), it also works here, but I can remember the / easier.

Steve Streeting \[Atlassian\], perhaps a future version can have a popup menu that a user can choose from, that SourceTree checks for at default locations, which would also show the version and path. Something like

Embedded (1.7.11.1) SourceTree.app

System (1.7.10.2) /usr/libexec/git-core/git

Homebrew (1.8.0.2) /usr/local/bin/git

comments: author: stevestreeting
body: We actually already check for default system locations and start the open dialog at that point, but really want to let people specify it themselves for the other options like Homebrew, because I don't want to assume in case it changes.


author: Insomniac Software
body: Ah, right. I forgot to add the last entry of "Other" that would allow them to pick a different install location.


author: stevestreeting
body: Ah, it's because when I click 'Use System Git' by default it finds the standard version (installed from [mercurial.selenic.com](http://mercurial.selenic.com)) in /usr/local/git/bin, which means I can get to /usr very easily.

One way to get around this for now is to go to Finder, press Cmd-Shift-G and type /usr/local/bin. Once you've navigated to that folder in Finder, it will appear in the 'Recent Places' list when you drop down the path in the open dialog. I'll try to make this work better in future if you only have the homebrew version.


author: Steven Mitcham
body: I can't select it, in the browse dialog the /usr directory doesn't show up. I'm guessing that this directory is only accessible from the unix-like side of OSX.


author: stevestreeting
body: What happens when you try to select it? I know of a number of people have used Homebrew's git before although I don't have it installed myself.


Tags: configuration

git
Which SCMs support "keep backups on destructive operations"?
Asked by Daniel Serodio:

In SourceTree Help, the help for "Preferences: General" says the following about the **Keep backups on destructive operations** option:

*If supported by the underlying system, whether to keep backup files when performing destructive operations like 'revert'.*

My question is: is it Mercurial or Git that support these backups?


Answers:
author: stevestreeting
body: At the moment only Mercurial implements this, keeping '.orig' files on revert.

comments: author: Daniel Serodio
body: Thanks, please consider adding this information to the Sourcetree's Help
Permission Denied (publickey)
Asked by Colin Karpfinger:

Hi,   

I'm receiving this error in Sourctree:  

Permission denied (publickey).  
fatal: The remote end hung up unexpectedly  
Unable to fetch in submodule path 'YBAudioFramework'   

I believe sourcetree prompted me for a publickey access at one point when I was neither pulling nor pushing, and I clicked deny out of principle. Now I'm being punished for that :) How can I give sourcetree access again? I tried going through keychain access and also removing the hostusername map from Library/Application Support/Sourcetree

Any other ideas?


Answers:
author: stevestreeting
body: Just FYI, the time SourceTree prompted you was because by default it does a periodic background fetch in order to be able to show you the ahead/behind markers relatively up to date without manual action. You can disable this in Preferences if you like.As for the error, are you certain your key works elsewhere? SourceTree just goes via ssh here so it's behaviour should reflect the command line too. The permission prompt is, IIRC, just to allow the app to use your keychain entry to unlock the key if it's pass phrase protected. I might be misremembering that since I haven't had to grant it in a hole, but I don't believe there's a 'Always deny' option, only allow, deny and always allow. It's possible the key has been unlocked in your session (Mac comes with ssh- agent effectively running automatically so you'll only have to type the pass phrase once) and the problem is actually a genuine key rejection.

comments: author: Colin Karpfinger
body: For some reason my key was working with another repo but not this one. I created a new key and now everything is working, so you were right it was a key issue, not a sourcetree issue.  

Thanks!
How do I find the repository created by SourceTree?
Asked by Robert Antonellis:

I just installed SourceTree on Mac Lion and created the repository. It's all working since I have a few test check-ins logged. But I can not find the repository. I need this so I can back up the file.

Thanks.


Answers:
author: stevestreeting
body: Yes, Time Machine backs up all files including hidden ones.


author: Robert Antonellis
body: Thanks. Until I sign up for BitBucket, does TimeMachine back up those hidden files created by SourceTree?


author: stevestreeting
body: When you create a Git or Mercurial repository, you actually do it in the same folder as the source files that you're putting under version control. So the repository is contained in a hidden folder called '.git' or '.hg' underneath that source folder. Finder doesn't display hidden folders by default, but it's there; if you want to quickly jump to your source folder in Finder, you can do it from the Actions Menu \> Show in Finder, or you can also do Actions Menu \> Open In Terminal, where 'ls -la' will show you the hidden .hg or .git folders. This is standard behaviour for Mercurlal and Git.

As far as backing up, the best way to do that is to push your changes to a server. If you're looking for convenience, Bitbucket allows you an unlimited number of private repositories for free (up to 5 users), so that's a good way to make sure your projects are backed up: <https://bitbucket.org>
"Current Branch" filter has no effect
Asked by Nathan Gray:

Switching between All Branches and Current Branch doesn't change the displayed commits in any way. I believe the Current Branch filter should only show commits that are reachable from the checked-out branch's head, but all local and remote branches remain visible.


Answers:
author: Alex Neth
body: This is still an issue.... The branch filter has no effect.

comments: author: KieranA
body: Hi Alex,

Have you got perhaps some repository we can access (a test one open source?) to show us more precisely what the problem is. Testing it here seems to work fine, so there may be a more specific case where this is a problem.

Cheers


author: KieranA
body: Apologies for the late reply. Is this still an issue? There can be cases in the log view where switching between "All Branches" and "Current Branch" makes it look as if no change has taken place, especially if there are little or no branches.
Can't use Assembla SVN repository
Asked by Setrio UY:

Hi, i can't clone an assembla SVN repository to use with SourceTree. It just get stuck after i set the login data. Any ideas? Tks!


Answers:
author: Setrio UY
body: Tks Steve! It works when i set the username in the URL.


author: stevestreeting
body: Alternatively, if you include your username in the URL it often resolves it, such as [http://yourusername@svnhost.com/path/to/repo instead](http://yourusername%40svnhost.com/path/to/repo%C2%A0instead) of just http://svnhost.com/path/to/repo


author: stevestreeting
body: Sometimes svn doesn't flush the user/password prompts properly for a non-terminal and gets stuck, the easiest way around this is to have logged in once on the command line. Please can you try 'svn info \<your URL\>' in Terminal?


author: Setrio UY
body: Yep, is like you say. Provide the login details and stuck. Also i don't have any triangle on the UI because it never ends after stuck (leave the checking for more than 10 minutes without luck).


author: stevestreeting
body: So you're prompted for the login details, and you provide those, then it doesn't get any further? Where exactly does it get stuck? If it's on the clone window you could expand the details by clicking on the disclosure triangle.

Also, what happens when you type 'svn info \<your URL\>' on the command line?
Public Key
Asked by Ralf Eisler:

To have access to a repository I need to connect with a public key -- which I have created with my Terminal (OSX).

Can I use this public key with SourceTree?


Answers:
author: stevestreeting
body: Absolutely, if it's in the standard place (\~/.ssh/id_rsa) that SSH picks up, SourceTree will automatically use it since it just calls git/hg, which calls SSH. I use this as my preferred approach for all authentication with SourceTree.
Customize column headings in repository file view
Asked by kpowick:

In the current file views for a SourceTree repositiory, the only columns visible are status Icon (*?* ), *Filename* , and *Path.*

Is there any way to add columns or customize this view to include information such as *Date Modified* , *Date Created, Kind*, etc.?

If this is not possible, could it be added as a feature? Being able to sort the file listing on this information would be highly useful.


Answers:
author: stevestreeting
body: This isn't supported right now, and the main reason is that it would add additional overhead to these views. The views are built entirely from the results of hg/git, which cannot report the information above as part of their operation. The only way to retrieve them would be to perform additional queries via the OS before the information is displayed. People are really sensitive about performance so I'm reluctant to add this as a standard part of the list - even if it's an option, people will turn it on without really understanding its additional overhead and then complain that SourceTree has got slower ;)

comments: author: kpowick
body: Ok, thanks Steve.

I didn't realize what would be involved. You're right about being sensitive to performance, and I understand not wanting to risk slowing down ST in any way.

Thanks for the quick reply.


author: MikeL
body: SmartGit also shows this information without major overhead.
Page Recovery
Asked by Xu Jiafan:

I delete my page,please tell me how to recover this page:<https://autocore.atlassian.net/wiki/spaces/ACEEAV1/pages/198574175/AutoSAR#%E6%89%80%E9%9C%80%E8%BE%93%E5%85%A5%EF%BC%9A>

I refered this solution:

<https://support.atlassian.com/confluence-cloud/docs/delete-restore-or-purge-a-page/>

but I can't find my page in my space.

Thanks a lot


Answers:
author: Sushant Verma
body: Hi [@Xu Jiafan](/t5/user/viewprofilepage/user-id/5216846)   

Welcome to the community!  

If you are the space admin, you ca follow below steps :

1. Select **Space settings** from the sidebar.

2. Select **Trash** from the **Manage pages** card.

3. Select **Restore** for the page you wish to restore.  

If you are not a space admin, please contact your space admin to restore the page from Trash.  

Regards,  
Sushant Verma


Tags: cloud

confluence-cloud
High image content confluence page, when exported to Word is missing images
Asked by Kamalan Chandran:

We use confluence in our project to create project related documents which are of different types. Some are light but some are really heavy with images (capturing system settings etc).

I see this particular issue when I download confluence pages having lot of image content.

To download, I navigate to the page in question, click advanced button (3 dots) \> click EXPORT \> EXPORT TO WORD.

The document in question has 55 pages (after download). Starting page 23, no images are loaded.

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

Above screenshot shows the generated word document with images not being rendered.

When I searched this community I found something similar (<https://community.atlassian.com/t5/Confluence-questions/Missing-images-on-Word-export-Confluence-Server/qaq-p/214531>) which is marked as resolved but I still see this issue.

Can someone please let me know if Confluence is the wrong tool or if that is not the case; what can be done to export word documents with the images intact?


Answers:
author: Barbara Szczesniak
body: [@Kamalan Chandran](/t5/user/viewprofilepage/user-id/4973670) Have you tried the workaround mentioned in this Jira ticket for the Cloud version: <https://jira.atlassian.com/browse/CONFCLOUD-34211>?

comments: author: Kamalan Chandran
body: Hello [@Barbara Szczesniak](/t5/user/viewprofilepage/user-id/5187859) This JIRA refers to a office connector for confluence for which last release was in 2016,

The documentation page on how to use this is archived or not found (<https://confluence.atlassian.com/display/DOC/Office+Connector+Prerequisites>).

Unfortunately, I am back to square one.


Tags: cloud

confluence-cloud