youngmon/atlassian-qna huggingface dataset:
Understanding Git merge in sourcetree/diffmerge
Asked by jmejiaa1986:

I use Diffmerge as my external tool but I think this is more of a git/brancing question.

When I have a conflict in a merge, what do each of the three windows correspond to?

Say I'm on branch "dev" and want to merge master into it. I click merge - from fetched(master).. When I get conflicts and go to resolve I have the following three windows for my resolutions:

Local/base/remote

I understand local is what I have, base is what will result in the merge. Does remote mean what is currently in the branch that I'm merging FROM(master)?

I would assume so as it has the changes coming in, but I want to make sure.

thanks


Answers:
author: Bal?zs Szakm?ry
body: I am not familiar with DiffMerge, so I cannot say which one is the file that will have the result (in most diff programs, base is in the middle and you merge into that from the two sides), but these are the inputs:

local: the file in the target (dev) branch

remote: the file in the source (master) branch

base: the file at the commit which is the last common ancestor of the two (the point where dev diverges from master)


Tags: diff

git

github

merge
How to compare two revision ?
Asked by Manu:

How to compare two revision and export the files only between that commit, in the same folder structure ?

Thanks


Answers:
author: Manu
body: I am asking how to do it with 'Sourcetree' .. with other tool its possible. Like TortoiseGit in windows. From logs we can compare two commit and compare and export files between that commit.

Thanks


author: Bal?zs Szakm?ry
body: The easiest is to have two clones, check out one revision in each and use some kind of folder comparison application to compare the contents.
Install fails with: Key not valid for use in spacified state
Asked by Gabe Avila:

Win7 32bit latest SP and latest updates.

I have used SourceTree for a while there no problem.

When upgrading to SourceTreeSetup_1.6.3.exe something went wrong and now I cannot install any version of it.

During "Status: Updating component registration", a message-box with caption "SourceTree" pops up saying: "Key not valid for use in spacified state".

I restored to a previous restore-point but didn't help. Cleaned up my creds vault, deleted any SourceTree leftover registry entries, and check to see if there are any SourceTree certs that might need to be deleted, but NO LOVE.

How in the world can I fully uninstall this thing so it lets me install 1.6.3?

I've been forced to use VS 2013's git integration and I'm about to go Hara-Kiri if this goes on for much longer man!

Thanks in advance


Answers:
author: wftpeterok
body: I have the same issue but only on one machine. Other updated fine.
Is there any possibility to ignore submodules when commit?
Asked by infojandusoft:

We have a lot of projects with submodules, we know that checking submodules is a goot thing before making a commit, but sometime, you know that none of the submodules must be check. It will save us a lot of time if we don't need to wait for sourcetree to check submodules.

For example, a commit button without submodules check will be great.

;)


Answers:
author: Bal?zs Szakm?ry
body: There is no option for this in SourceTree, but you can make a feature request [here](https://jira.atlassian.com/browse/SRCTREEWIN/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
Pull Request Successful with Exception: STATUS_ACCESS_VIOLATION
Asked by Lenon Marumbwa:

Each time I do pull changes the message below is shown. But the number of pulls available stays the same. Effectively not getting the new commits from team members.

How can I solve this problem? Thanks

![](https://answers.atlassian.com/upfiles/access_violation.png)


Answers:
author: KieranA
body: Hey Lenon,

This is Git itself which is broken. Have you tried reinstalling it? And are you using embedded or system Git?

Cheers

comments: author: Lenon Marumbwa
body: Hi. I am using Embedded Git version 1.8.3 i don't have git installed as a standalone. I tried re-installing. Once i reinstall Sourcetree, it works fine the first time only ie.( i can push fetch and pull) then afterwards I can only push without pulling and it throws the above exception again. Using sourcetree for Windows


author: KieranA
body: OK, you'll want to raise this on support.atlassian.com so it can get the support team to follow it up who'll pass it on to me if necessary. Cheers


author: Lenon Marumbwa
body: Okay.Thanks let me do that now


Tags: windows
I need to change my email.
Asked by bank32:

Hi All  

I want to seperate my account to my own account and my company account. I think it should be seperate email, can I change my old account email is ---- to ---- and I will register new account.

I need to change my current email to ---- because I registered name is my company name and I can't find how to change register name in application.

EDIT: Redacted email addresses for poster's privacy


Answers:
author: Seth
body: I think you need to submit your request to [support.atlassian.com](http://support.atlassian.com). This is a public forum, and most responders (myself included) do NOT work for Atlassian and cannot fulfill your request.

comments: author: bank32
body: sorry about this but I think it's question about privacy why you tell me to post to public forum ?


author: Seth
body: I did not. THIS is public. [support.atlassian.com](http://support.atlassian.com)is NOT public.
SourceTree doesn't run KDiff3 correctly - "Opening of these files failed"
Asked by Jason Haines:

I installed (latest Windows versions of) SourceTree 1.6.3.0 and KDiff 0.9.98 and configured KDiff3 as the external diff tool.

When I right-click on an "Unstaged file" and run an "External Diff", KDiff3 start and reports a "File Open Error":

Opening of these files failed: - C:/tmp/Va79su_\<my filename\>

The directory C:\\tmp\\ is empty (even after I created the directory). I've tried KDiff3 and Custom command-line settings for "External Diff Tool" and get the same result.


Answers:
author: Bal?zs Szakm?ry
body: The answer [here](/questions/327098/sourcetree-external-diff-tool-doesn-t-launch-and-conflicts-disappear) might help.

comments: author: Jason Haines
body: Unfortunately not.


Tags: kdiff3

merge

windows
Sourcetree Bug Report
Asked by Francis Pritchard:

I am using v. 1.6.3. If the file loaded in the "difference" window is too big, after I have staged a hunk the file will not reload in to the window - it has a couple of goes but the window remains empty.

The workaround is just to select another smaller, file, then the large file will load fine.

When enough hunks are staged, it reloads ok.


Answers:
author: Seth
body: Bug reports belong on [jira.atlassian.com](http://jira.atlassian.com)

Thanks for taking the time to submit this.
Sourcetree says there is nothing to commit
Asked by elderuyld elderuyld:

Hi. I've been using sourcetree for quite a while, but from the latest update I've been experiencing some problems.

The problem is that I've made some changes in my code and when i go to sourcetree to commit them the following happens:

![sourcetree](https://i.imgur.com/QM9NU7O.png)

As you can see there are changes in my code, both in the left side and top-center it says that I have uncommitted changes, but in the bottom it says there is nothing to commit. In addition if I press the commit button it will say that there is nothing to commit.

Any ideas?


Answers:
author: Seth
body: Already [asked and answered](/questions/328849/source-tree-windows-1-6-does-not-show-uncommitted-files).


author: fuck atlassian
body: I found a great solution - uninstall sourcecrap and use something else.

comments: author: Lawrence Dol
body: Wow, that's an unconscionably arrogant comment for software distributed for free. Clearly you have no grasp of how much work goes into writing software.


author: Vahram
body: Wow that's a quite deadset answer.


author: Bill Wallace
body: Same problem.

An answer would be great.

comments: author: Seth
body: Did you follow the link in my answer?


author: Bill Wallace
body: No .. because when I did the search your answer was not shown in the results before I posted.I have now of course.Thanks
How to restore local changes that was removed by hgflow inititialize?
Asked by Oleg Batishchev:

I haven't commited the local changes and SourceTree+hg flow created the file .hgflow in each of branches and my local changes missed. Where is it ???


Answers:
author: Oleg Batishchev
body: In no way. But fortunately, my IDE (phpstorm) has history of changes too. It helps really! I like it.
unable to install sourcetree on my pc
Asked by alagu raja kumar:

I was using Source Tree with bit bucket for past 2 months. yesterday i got software update notification by source tree. When I accepted to update something went, and gave me an ERROR saying "Keyset as registered is invalid", and Source Tree setup wizard ended prematurely.

check snapshot below

![](../../upfiles/1_9.PNG)

![](../../upfiles/2_6.PNG)

![](../../upfiles/3_2.PNG)

![](../../upfiles/4_1.PNG)

![](../../upfiles/5.PNG)

I hope you guys can help me this problem.

Thanks for answer.


Answers:
author: alagu raja kumar
body: Step 1: Delete this file --\> C:\\ProgramData\\Atlassian\\SourceTree

step 2: Delete this file --\> C:\\Program Files (x86)\\Atlassian\\SourceTree

step 3: Open your command prompt and type "regedit"

step 4: Search for a file "sourcetree" and delete it

step 5: Restart your system and you are good to go


Tags: install
Where is the recent comments button for commits in SourceTree?
Asked by John Schlumpf:

I just upgraded to SourceTree 1.6.3.0 ( windows version ) and noticed that the button / dropdown for selecting a recent comment to attach to a commit is gone. Has this feature been removed or just moved somewhere else? It's a big time saver to be able to add the same comment to multiple commits without having to retype it each time.


Answers:
author: Johannes Kilian
body: [Are you looking for this?](http://i.imgur.com/p33PIdE.png)

![](http://i.imgur.com/p33PIdE.png)

comments: author: John Schlumpf
body: Yes, thank you!
Country option in registration
Asked by Hsueh-Min Chen:

I am from Taiwan, an independent country in the world. But the only option I can select is "Taiwan, province of China". I hope SourceTree team can correct it.


Answers:
author: Hsueh-Min Chen
body: [](https://en.wikipedia.org/wiki/Taiwan,_China)[https://en.wikipedia.org/wiki/Taiwan,_China](https://en.wikipedia.org/wiki/Taiwan%2C_China)

In fact, China(PRC) claims but does not control Taiwan as part of its territory.

Also, most of Taiwanese people does not agree that "Taiwan is a part of China(PRC)".


author: Seth
body: I apologize for my ignorance of Asian geography, but are there two Taiwan's (one a province and one a nation)? Or did the SourceTree team mis-identify Taiwan as a province instead of a nation?
Setting remote to a specific branch?
Asked by Benjamin Allison:

So I understand the value of branching, but one thing is confusing me.I have my local repo. I push changes to a remote, which has a post receive hook setup to write files on a website.So I create a branch (new-branch) to try out something. I edit files, commit, and push to the remote. Great. Problem is, while the repo on my remote is up to date, I guess it's still set to master,as the changes in new-branch aren't reflected on the site.How do I set the remote to a particular branch so that that branch is driving the post receive hook, and not just defaulting to the master branch? I would just merge on master but I'm not ready to as I'm still working out the kinks on the branch.


Answers:
author: Graham Stewart
body: While I can not answer your question specifically, I found that A Successful Git branching model written by Vincent Driessen [](http://nvie.com/posts/a-successful-git-branching-model/)<http://nvie.com/posts/a-successful-git-branching-model/>provided an explanation on how to create a workflow that handled separate branches for developement and production code.

There are also some excellent tutorials on different workflows with git on the atlassion website as well.

Graham


author: Seth
body: See if [this StackOverflow question](http://stackoverflow.com/questions/7351551/writing-a-git-post-receive-hook-to-deal-with-a-specific-branch) helps.
SourceTree: Obliterating large files from a Git repository
Asked by Alex Rodrigues:

Our git repository is around 2GB and when cloned accounts for around 3GB due to the checkout in the workspace. I know there are a couple of very large binaries that may have been deleted form version control in the past but still exist in the repository.

Is there a way using either SourceTree or Stash to identify and/or delete these files?


Answers:
author: Johannes Kilian
body: Hmmmm ... as those files are part of the history of your project they shold not be removed from the repository - doing so you won't be able to checkout a complete historical version of your software (as the files you removed finally are not part of the repository anymore).

Usually removing files from the repository is only done when those files were added by accident and you are completly sure you don't need them - even in historical versions of your software. If you say, "I don't need the files *anymore*" this involves you needed the files earlier - and therefore the files should not be removed (as you cannot reconstruct them)

Removing files from the repository is a git task - and therefore not part of stash. Sourcetree does not offer this as well - you have to do this on comand-line using the command

```
git filter-branch --tree-filter ....
```

as for example [described here](http://dalibornasevic.com/posts/2-permanently-remove-files-and-folders-from-a-git-repository).

The best way to do this, is cloning your repository from stash and performing the git-filter action on your local clone. After approval that your local repository looks fine, you should remove the "huge" repository from STASH and re-push the modified repository. After this you have to be sure that all of your coworkers remove their old local copies of the repository and clone the modified one!

If your main concern is the size of the repository to clone (2-3GB) you should consider to do a shallow clone (as for example [described here](http://blogs.atlassian.com/2014/05/handle-big-repositories-git/)). A shallow clone allows you to clone a repository keeping only the latest n commits of history. Therefore you can omitt those large historical files from cloning - with the drawback not to have the complete history of your project locally available.

comments: author: Alex Rodrigues
body: Thanks Johannes.

Yes, the large files I would like to delete were added accidentally and are not being used at all. Thanks you for the link that explains how to go about with removing the files.

Shallow clones may not be for us as it has some limitations about committing changes to that type of clone.


Tags: git
Source Tree Windows 1.6 does not show uncommitted files
Asked by Graham Stewart:

I have just upgraded to version 1.6/1.6.1 and I am not able to see the files that are either changed in the working directory or have been staged in either the file status view or the log/History view with uncommitted changes selected.

All I see is a blank area with the message nothing to commit and a button Open in Explorer. I know there are changed files including a new file in the working copy that have not been added to the staging area I also know there is 1 file in the staging area. These are indicated in the status.

Changing the selections in the dropdown menu that allows to select the number columns or how the staging area is displayed does not change anything.

I have reverted back to 1.5.2 and the changed files are correctly displayed in the two panels.

Graham


Answers:
author: Seth
body: I had the same problem when I first upgraded.

When you hit the first dropdown menu above the file list, there are two sections: "Show Only" and "Sort By". BOTH of these need to have a selected value, but for some reason "Show Only" was unchecked for me after the initial upgrade, so no files showed. Selecting "Pending" solved the problem.

comments: author: Graham Stewart
body: Yes thanks that solved the problem. Looks there should have been a default set on that menu as there was no items checked in the show only section.

By the way, I upgraded back to 1.6 to try your solution and 1.6.3 was the upgrade offerred.

Thanks


author: carolinepetherick
body: re: 'hit the first dropdown menu above the file list'. Sounds, great - but what, and where, is the file list, please?


author: ????????? ???????
body: Thanks it helped me.


author: digit_dev
body: I had the same problem too. Removing hidden **.git** file in project folder, solved the problem for me.


author: Matt Jacobsen
body: I have the same problem. Opening the terminal and running "git status" shows the changes, but the GUI doesn't recognise them. Where can I get the installer for 1.5.2?

comments: author: Matt Jacobsen
body: <http://downloads.atlassian.com/software/sourcetree/windows/SourceTreeSetup_1.5.2.exe>


Tags: windows
SourceTree: Are there plans to introduce an explorer for SourceTree
Asked by Alex Rodrigues:

An explorer would help browse changes by a specific folder?


Answers:
author: Jeff Thomas
body: Hi Alex,

Looks like there is open feature request for this at [SRCTREEWIN-1313](https://jira.atlassian.com/browse/SRCTREEWIN-1313). Feel free to Watch or vote on this issue to stay updated and let our development team know that it's something you're interested in.
SourceTree: Viewing commit history of a branch that is not currently checked out
Asked by Alex Rodrigues:

I ahve several branches that have been checked out over the past month but I would like to view the history of a branch that is not current active in my workspace withouth having to switch to it. Is this possible?


Answers:
author: Seth
body: You can view the history of the entire repository (all branches) in the Log/History window. If you want to filter to JUST a specific branch, you'll need to check it out.

If you like, propose a feature request at [jira.atlassian.com](http://jira.atlassian.com)
SourceTree: How can I merge from a tag?
Asked by Alex Rodrigues:

I am able to merge from the tip of a branch but do not see an option to merge from a tag. Is this possible within SourceTree?


Answers:
author: Seth
body: Are you wanting to merge the entirety of a branch up to a tagged commit, or just the single commit?

To "merge" just the one commit, you want to right click the commit (no tag necessary) and "Cherry pick" it.

To merge a branch up to a tag that isn't the latest commit in that branch, you'll need to create a new branch on that commit, then merge with the new branch.

Tags are just named commits. There is really nothing you can do with them that you can't do with a commit hash.

comments: author: Alex Rodrigues
body: Yes, I want to merge the entirety of a branch up to a tagged commit. Using the Git command-line I can do this in one step (i.e. git merge \<tag\>) so I was expecting a way to do this in one step using SourceTree withouth having to create a new branch.

I will consider submitting an enhancement request for this functionality to be added to SourceTree


author: Alex Rodrigues
body: Well since I typically merge from a tag on a different branch (not the one I have checked out), I need to be able to display the history \& tags of the other branch to be able to right-lick it, but that does not appear to be possible in SourceTree


author: Seth
body: Looks like you may be able to right-click any commit in the graph and choose "Merge...". I haven't tried this myself, so I don't know what to expect.


author: Seth
body: Sure you can. Above the graph, change the dropdown from "current branch" to "all branches".


author: Alex Rodrigues
body: Ahhh, didn't realize that! However I now find that I have too much information making it tought to find the tag that I want with lots of scrolling required. Is there a way to easily zero down on the tag that I am looking for?


author: Seth
body: Use the Search tab, right click on the commit you want and "View in Full Log".


author: Alex Rodrigues
body: Took me awhile to find the "Search tab" right at the bottom. This tab allows me to search by Authors, Commit Messages and File Changes but not by tags which is not that straight-forward as I might know the tag name but not necessarily the commit mesasge associated with it.

The "Jump to" option in the top right-hand corner seems to hold more promise. However the drop-down does not have a scroll-bar making it tough to find the tag I am looking for (if it is way down in the list) and requiring me to scroll a lot using the mouse wheel. Can this be enhanced?

The "Jump to" option also contains a "Jump to Commit" option within it. It would be great if this could be enhanced to provide the ability to Jump to branch or tag that is typed in
Predefined list of labels
Asked by joris_monten_cegeka_com:

In Confluence server we've got the ability to use the 'Labels Cage' app.  
This app allows us to create a list of predefined labels, page creators only can choose labels out of those list.

In that way we were able to reduce the wildgrow of labels.  

Now in the cloud version this app isn't available anymore, but there isn't an alternative currently.  
Maybe something that Atlassian can develop?

What do we want?  
Admins can create a set of predefined labels  
Page creators can klik on the '+label' button and only choose between the predefined labels.  

Why?  
To prevent the wildgrow of labels (like: User-story, userstory, user-story, user-storie, ...)  
Also because we've got a page that will filter on epics (based on labels) for our customers.

Thanks!


Answers:
author: juela.zeneli@communardo.com
body: Hi [@joris_monten_cegeka_com](/t5/user/viewprofilepage/user-id/3653928) ,

I would suggest you try out [Metadata for Confluence.](https://marketplace.atlassian.com/apps/1213690/metadata-for-confluence?hosting=cloud&tab=overview)

With this app in the cloud, Admins can create Content Categories that contain Metadata fields.

Users can add the Content Category with the fields in their Confluence pages. This will guide the users to keep consistency in the content they create.

You can also create different reports with the Report macro.

We can have a call if you are interested and would like to know more about it.

Have a nice day,

Juela


author: Aron Gombas _Midori_
body: You're right. Although there are several [apps to ease managing labels](https://marketplace.atlassian.com/search?hosting=cloud&product=confluence&query=label) also on Cloud, they don't allow limiting labels to a pre-defined set. You could use them to clean up the labels, drop the unwanted ones, merge some, etc., but it is still manual post-mortem kind of work.

To be honest, I think that such an app is not available, probably because Confluence does not allow "vetoing" a label assignment or overriding the "Add label" experience - something that is doable on Server/Data Center.


Tags: confluence-cloud

cloud
Adding comments over an image.
Asked by Bormann, Peta:

I can see that this is available in Confluence. Is it possible to do the same on an image within an issue in Jira?

Like this...

<https://support.atlassian.com/confluence-cloud/docs/share-and-comment-on-files/>


Answers:
author: Marc - Devoteam
body: Hi [@Bormann, Peta](/t5/user/viewprofilepage/user-id/5272649)

Welcome to the community.

Unfortunate this is not available in Jira, as in Jira you would leave a comment on an issue and not on an attachment that is inside an image.

As Confluence is a wiki, there it is useful if their might be a problem with an issue or it servers as explanatory information

comments: author: Bormann, Peta
body: Thanks [@Marc - Devoteam](/t5/user/viewprofilepage/user-id/3796976) I appreciate you answering the question.

P


Tags: cloud

confluence-cloud