youngmon/atlassian-qna huggingface dataset:
Can we have multiple projects/applications in one repository
Asked by Shyam:

Can we have multiple projects/applications in one repository,

Like if make changes on one project in that repo, it should not effect on other project..

And is it possible to bring only one file from that one particular project to other project with in repo?

is it advisable to have multiple repositories when we have more projects in our organization OR one repository with multiple projects? which is recommended?

Please suggest


Answers:
author: Caroline R
body: Hi, [@Shyam](/t5/user/viewprofilepage/user-id/4756005), thank you for reaching out to Atlassian Community.

Could you please give us more context about your business case? Why exactly do you want to have multiple applications in the same repository? With this information, we will be able to help you better.

Looking forward to hearing from you.

Kind regards,   
Caroline

comments: author: Shyam
body: Hi Caroline,

We have SharePoint on premises 3 environments and different upcoming environments

so For the above situation we want to plan creating repositories for these environments.

Our Bitbucket is integrated with Jira

so

is it good to have one repository and multiple projects in it?

or one project with multiple repositories in it? if yes, why? Please suggest


author: Caroline R
body: Hi, [@Shyam](/t5/user/viewprofilepage/user-id/4756005),

Thanks for getting back to us! By your description, I understand you are referring to what's called a Monorepo, a repository that contains more than one logical project (e.g. an iOS client and a web-application).

We do have a very good tutorial that explains the concept, the challenges, and some strategies to work on a monorepo. So, I would recommend that you access this doc to understand if having a monorepo would work for you or if it would be better to split this repository into two or more repos:

* <https://www.atlassian.com/git/tutorials/monorepos>

In case you would like to read how to split a repository in two, I suggest the following doc:

* [Split a repository in two](https://support.atlassian.com/bitbucket-cloud/docs/split-a-repository-in-two/?_ga=2.99382174.1474253475.1551115581-589830497.1549307786)

I hope this helps, but let me know if you have questions.

Kind regards,   
Caroline


author: Shyam
body: Hi Caroline,

Thank you for the response. I believe in my case monorepos is not good option as we do have multiple environments and also environments grows further bigger. Thanks.

Please confirm


author: Caroline R
body: Hi, Shyam.

I'm glad to know the documentation helped. In this case, if the different projects you have are unrelated, or if they are related and can be connected by other means, then we recommend that you split this into more repositories.

Kind regards,  
Caroline


Tags: atl-gruland

bitbucket-cloud

cloud
Bring only one specific folder and file from one branch to another branch, is it possible?
Asked by Shyam:

we have created feature branch it has 10 files and 1 folder.  
and we have created one test branch and which is empty, now I want to bring only that one folder from feature branch to this test branch  
is it possible? If yes please tell me how we can achieve this?

Please help


Answers:
author: Caroline R
body: Hi, [@Shyam](/t5/user/viewprofilepage/user-id/4756005), thank you for reaching out to Atlassian Community.

If you don't want to merge the entire feature branch to your test branch, I recommend that you use the **git cherry-pick** command. This is the act of picking a commit from a branch and applying it to another.

In this case, you could run the command **git log** to find those commits and cherry-pick them to your test branch. After you find the commits you want, you can run the following command to add them to your test branch:

```
git cherry-pick {commitSha}
```

You can find more details about git cherry-pick in our Git tutorial here:

* [Git Cherry Pick \| Atlassian Git tutorial](https://www.atlassian.com/git/tutorials/cherry-pick#:~:text=Cherry%20picking%20is%20the%20act,to%20where%20it%20should%20belong.)

Feel free to share any additional questions or concerns regarding this case.

Kind regards,   
Caroline

comments: author: Shyam
body: Hi Carlone,

Thank you for the response.

Can u please assist on below query also

<https://community.atlassian.com/t5/Bitbucket-questions/I-am-not-able-to-push-to-remote-repo/qaq-p/1946015#M78362>


Tags: bitbucket-cloud

cloud
Minutes when setting WAIT to true in trigger-pipeline
Asked by LoLei:

<https://bitbucket.org/atlassian/trigger-pipeline> has a setting called \`WAIT\`, that if set to true, will wait for the triggered pipeline to finish, in the pipeline that triggered it.

When setting this to true, do both pipelines count towards one's Bitbucket Pipelines minutes usage? Or is the "waiting" pipeline "suspended" from the minutes, while it waits?

This would be ideal. Otherwise, many people, including me, would be deterred from using the \`WAIT\` feature, if it means essentially doubling the minutes used for each triggered pipeline.

I presume that both pipelines count towards the minutes, so I'd like to add this as a feature request, if nothing else.


Answers:
author: Norbert C
body: Hi [@LoLei](/t5/user/viewprofilepage/user-id/4631264)

Thank you for contacting Atlassian Community, my name is Norbert and I'm a Bitbucket Cloud Support Engineer, it's nice to meet with you!

I would like to inform you that "waiting" the pipeline is actually counted against the build minutes because the build is actually running.

I've opened a feature request for you: [BCLOUD-21716 - WAIT flag in trigger-pipeline pipes is counted against build minutes](https://jira.atlassian.com/browse/BCLOUD-21716)

Our development team will give a first-hand update on that ticket if there's any progress made so I would suggest keeping a watch and vote for it.

Do note however that there's no ETA on enhancement request, and all enhancements are implemented with this policy in mind: [Implementation of New Features Policy](https://confluence.atlassian.com/support/implementation-of-new-features-policy-201294576.html)

Please let us know if you need any further assistance.

Best Regards,  
Norbert  
Atlassian Bitbucket Cloud Support


Tags: bitbucket-cloud

cloud

trigger
This is not a valid source path / URL
Asked by Terry Rogers:


Answers:
author: William Zanchet [Atlassian]
body: Hi Terrence,  

Based in your title, I could find the following answer that might help us there:  

<https://answers.atlassian.com/questions/232561>  

Can you please check it, and let me know how it goes.  

Cheers,  
WZ
how to show commit info?
Asked by Olin Kotik:

please, how I can show commit info in marked area (screen attached), thank you very muchSn?mek_obrazovky_2015-05-19_v 13_29_15.png  
[](https://community.atlassian.com/t5/Sourcetree-questions/how-to-show-commit-info/qaq-p/349393?attachment-id=1871){#link_116a50c6056f7f}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/10420/1/Sni%CC%81mek_obrazovky_2015-05-19_v%C2%A013_29_15.png){#display_116a50c6056f7f_0}


Answers:
author: Bal?zs Szakm?ry
body: Right next to the left side of your red box, there is an area which is collapsed to 0 width. If you open that, you will see the details.

comments: author: Olin Kotik
body: okey, thank you  
this is a hidden issue, is possible to fix/resolve it better in future version(s) of the app? :)


author: Bal?zs Szakm?ry
body: Out of the box, this area has a non-0 width. You (accidentally) did something that collapsed it completely.


author: Olin Kotik
body: i understand, but this is mistake, which should be fixed by developer :)thank you for your assistance :)


author: Olin Kotik
body: Sn?mek_obrazovky_2015-05-19_v 13_29_15.png  
[](https://community.atlassian.com/t5/Sourcetree-questions/how-to-show-commit-info/qaq-p/349393?attachment-id=7947){#link_116a50d8aaee5d}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/10423/1/Sn%C3%ADmek_obrazovky_2015-05-19_v%C2%A013_29_15.png){#display_116a50d8aaee5d_0}


author: Bal?zs Szakm?ry
body: This does not load anything. If you edit the question, you can paste the screenshot directly into it. (The image itself, not the file containing the image.)


author: Olin Kotik
body: <http://clipitto.com/PfEOTc>
How do I change the default behavior of Apply Stash to not delete after applying on a Mac?
Asked by Unicycle:

The default behavior when Applying a Stash in the Mac version of SourceTree is to delete after applying. In the Windows version, the default is to NOT delete after applying. I'm curious why these defaults are different, but more importantly, I am curious where to change this default behavior on a Mac. I would like the default to be to NOT delete after applying. How do I make that configuration change?


Answers:
author: sreekumar_menon
body: There is a "delete after applying" checkbox in the apply stash dialog box in mac version. are you suggesting that the checkbox should be unchecked by default?

comments: author: Unicycle
body: If I were to make a suggestion, it would be to have that checkbox configurable. So that in preferences I could set whether it defaults to checked or unchecked. At present, the default behavior is not configurable (as far as I can tell) and behaves differently in the Mac version versus the Windows version.


author: Wam Sangrattanamanee
body: I second the request for this feature. From my real life example, I need to keep my temp version of a binary file for testing purpose and since many member of the team need to work on this same file, our workflow is to keep the one i owned in the stash and apply it to overwrite the change after sync with main branch.There were time that I forgot to uncheck that box and sync with main branch so I have to rework the whole of my version of the file write from the scratch.


Tags: bitbucket-server

mac
In SourceTree, I always get the error "Unexpected end of command stream" every time I try to check out. What is causing this?
Asked by Matt Swartz:

Here is the full output it gives:

git -c diff.mnemonicprefix=false -c core.quotepath=false clone --branch Merge --depth 2 --recursive https://username@bitbucket.org/username/mygit.git C:\\MyFolder  
Cloning into 'C:\\MyFolder'...  

Unexpected end of command stream  

Completed with errors, see above.


Answers:
author: Matt Swartz
body: Unfortunately that is not the cause. The URL is correct, and as a test I used the terminal to do it and it worked fine.

The problem is with SourceTree. The program has been nothing but problems for me, I wish the staff would update it and this site in general...


author: sreekumar_menon
body: This usually happens when the git url is incorrect . Check if the url is correct and note that url is case sensitive.
git commit --fixup
Asked by martenlehmann:

<http://fle.github.io/git-tip-keep-your-branch-clean-with-fixup-and-autosquash.html> shows how to use --fixup option to mark a new commit as being a fixup of an existing commit (like fixing a typo etc.).

While SourceTree offers a context menu during commits ("Commit options..."), this menu doesn't contain a way to make use of the --fixup option. It would be great if SourceTree would add this feature, like open a dialogue and scroll through the last commits and just mark one.


Answers:
author: Steven Vachon
body: I created a feature request for this: <https://jira.atlassian.com/browse/SRCTREE-4594>

comments: author: Pavel O_
body: [@Steven Vachon](/t5/user/viewprofilepage/user-id/541068), I like your initiative.

I see it's in "Sourcetree For Mac" JIRA, for some reason. I guess it should be on all platforms. I think it should be there by default.

Unfortunately, they've just closed the ticket as "**Unresolved** ".  
I'm wondering, what they ware trying to say to us...


author: Paul James
body: You can create a custom action in Sourcetree to create a fixup commit.

In Preferences, go to the Custom Actions tab and add a new action, call it Fixup and set the script to "git" and the parameters to "commit --fixup $SHA". Now you can stage changes and then right click a commit and choose Custom Actions -\> Fixup to create a fixup commit based upon it.

comments: author: Mattias Hilliges
body: Thank you, this saves me lots of time!


author: Seth
body: I don't completely understand what --fixup does, but feature requests should be posted to jira.atlassian.com where they can be voted for and tracked. I always recommend posting a link here as the answer so others can find it to vote for it.
git fetch origin master:master
Asked by Peter Siegmund:

How can I do the command **git fetch origin master:master** within SourceTree? I need the complete command and not only a **git fetch** or **git fetch origin** or **git fetch origin master**...

Update: I opened a feature request: <https://jira.atlassian.com/browse/SRCTREE-3058>


Answers:
author: Bal?zs Szakm?ry
body: Also, there is no way to pull into any other branch than the current. (But I think you mean fetch, not pull.)


author: Seth
body: Hold up, in that feature request you're talking about Pulling branches. Fetch and Pull are very different. Fetch updates the data your repository has about the remote repo, Pull updates your local branches to match the remote.


author: Bal?zs Szakm?ry
body: I think the reason for the "git fetch origin master" not working is that there is no tracking relationship between the local master and the origin/master.


author: Bal?zs Szakm?ry
body: BTW what is wrong with fetching all the other branches as well? It has no harmful effect to your local branches or your workspace. (The only thing it does is update all the origin/\* references.)


author: Peter Siegmund
body: Don't know, but only master:master worked for me. I wanted to update the master branch without changing into it.


author: Seth
body: What's the difference between "git fetch origin master" and "git fetch origin master:master"?


author: Bal?zs Szakm?ry
body: This level of detail is not possible with the SourceTree UI. You can create a feature request for this at <http://jira.atlassian.com> (post the link in a comment so others can vote for it.)

comments: author: Peter Siegmund
body: But the UI has a "fetch" command button. Why can't someone add the branch names there? Where can I request this as a feature?


author: Bal?zs Szakm?ry
body: Edited the answer to contain that info.
File selection changes automatically
Asked by Maarten van Dillen:

When I'm reviewing my unstaged files for commit, once in a while a refresh happens and the selected file I was reviewing on the right pane jumps over to another one forcing me to reselect the previous file again. This happens even when the Refresh option is unchecked in the preferences. Is this normal behavior or am I missing something here?


Answers:
author: Bal?zs Szakm?ry
body: There are two settings in Tools\\Options\\General that might affect this:

1. Refresh automatically when files change (I guess this is the one you have off)
2. Check default remotes every N minutes (I would expect the background fetch to come with a refresh)

comments: author: Maarten van Dillen
body: Thanks, the second option seems to fix it for me.


author: Seth
body: I'm not sure what qualifies as "normal", but this happens to me all the time.
Suddenly "SSH Authentication Failed"
Asked by V?t?zslav Ferko (Qwerty):

Hello,

everything worked fine, but suddenly this message always appears when trying to checkout another branch.

At first I realised I was working on wrong branch, I stashed my work and checked out the correct branch, but then I couldn't find the stash. I am quite new to Source Tree so I searched on the web where it should be, but it wasn't. Then I checked out my old branch, hoping the work would still be there, it wasn't neither, I checked out back an forth swiftly few times.. :smile:, then this message started to appear. I restarted SourceTree, hoping it would help with the message, but it didn't... anyway, this resolved my issue with missing stash. Now I can see it, but I can't do anything else.

**So, there are two problems:**

1. Stash missing, showing after SourceTree was restarted
2. Swift changing of branches led me to "SSH Authentication Failed"


Answers:
author: Bal?zs Szakm?ry
body: It also might be that when you restarted SourceTree, your SSH agent was not launched. Make sure it is running.

comments: author: Seth
body: Did you mean "SSH Client" or "SSH Agent"?


author: Bal?zs Szakm?ry
body: Agent, I corrected my answer.


author: Seth
body: Check with your repository host. Your swift checkouts may have triggered some firewall rule that tries to prevent DDOS attacks.


Tags: authentication
How do I pass the absolute path to an external diff tool for both $LOCAL and $REMOTE when one of those is associated with the currently checked-out commit?
Asked by intelligen:

I'm trying to use an external diff tool to compare a given file from two commits. If I select two commits in SourceTree and neither one is currently checked out, the file is checked out from each branch, copied to a temporary location, and the absolute (full) path of each is passed to the external diff tool. Everything works fine.

However, if one of the commits is currently checked out, the absolute path is not passed to the external diff tool. It seems only the filename (or perhaps relative path, based from the root working dir of the git repo) is passed. This causes the external diff to fail because the current working directory is the directory containing the external diff tool, rather than the appropriate directory within the git workspace ($PWD in SourceTree).

If I replace $LOCAL and $REMOTE with $PWD\\$LOCAL and $PWD\\$REMOTE, respectively, the absolute path for the file in the currently checked-out commit is passed correctly, but of course this breaks the other one (the temporary file path from the branch which is not checked out).

I've also reproduced the same issue with *git difftool* on the command-line, but of course when running the path on the command-line, the current working directory is correct. Is there a workaround to make SourceTree prepend $PWD\\ only when necessary? If not, is there some other solution that will solve my problem?


Answers:
author: intelligen
body: This issue seems to be a defect in SourceTree's design. Normally when you use git, your current working directory is in the git repo. SourceTree, on the other hand, does not set the the git repo as the current working directory, so any relative paths will be incorrect.

I ended up having to create a batch file and pass $PWD as an additional argument. (In my testing, I found that $PWD apparently reports the root of the git repo.) The batch file cd's into $PWD, then passes the remaining arguments to the external diff tool.


author: Seth
body: First of all, seems like the solution is going to be OS dependent.

Secondly, if your difftool is in your OS's PATH variable, the diff tool should be runnable from you repo directory instead of the difftool executable's directory.

comments: author: intelligen
body: To clarify, the problem seems to be that SourceTree just calls git difftool from the external diff tool's directory, rather than cd'ing into the correct directory first.
Malware suddenly this morning says Sourcetree has a Trojen-Inject issue.
Asked by Adrian_Tilston:

sourcetree.exe keeps getting inoculated.


Answers:
author: Adrian_Tilston
body: So I deleted all the .exe's and the .dll's in the program folder, downloaded the latest and greatest installer, ran it with repair option, set Malware to ignore the file, crossed my fingers and ran it. Seems all is well again.


author: Darian Cabot
body: I have the same problem. Malwarebytes Anti-Malware Home (Premium) 2.1.6.1022 has quarantined SourceTree.exe and labelled it "Trojan.Intact" a few hours ago.

I restored the file and scanned with Avast Antivirus 2015 and it reports "no threat found", so it seems to be a false positive.

I'm running SourceTree 1.6.14.0 by the way.


author: rrudnicki
body: Could you try with a different anti-malware to see if you still get this message?

Regards,

Renato Rudnicki


author: Adrian_Tilston
body: Had the problem - downloaded the installer - fixed/repaired - still have the problem


author: Seth
body: And the problem started after that, or that fixed the problem?


author: Adrian_Tilston
body: I just downloaded the SourceTreeSetup_1.6.14.exe and fixed/repaired.


author: Seth
body: What version of SourceTree are you running?
How do I change my user timezone in Sourcetree ?
Asked by Adrien Bayles:

My commits are listed with the wrong timezone information (which is probably the timezone of Los_Angeles, whereas I am in Paris).

I could not find this parameters in the general settings menu.

Capture.PNG

note : I sleep at night and get up late. Impossible for me to perform commits at such hours of the day !  
[](https://community.atlassian.com/t5/Sourcetree-questions/How-do-I-change-my-user-timezone-in-Sourcetree/qaq-p/102124?attachment-id=8526){#link_116a51996cca8c}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/2901/1/Capture.PNG){#display_116a51996cca8c_0}


Answers:
author: Tim Crall
body: Check your computer's time zone setting.

I just verified that changing my computer's time zone setting changes the time that SourceTree applies to a commit (which is the behavior I would expect).

comments: author: Tim Crall
body: Actually the commit timestamps appear to be internally saved in a location-independent manner and then displayed appropriately for the time zone your computer says that it's in.
Fatal authenticate error
Asked by Hui Zhao:

I want to clone a repository in Source tree. However it asked me to input the password each time. And it failed of course. I found the gray username is different from my username in Bitbucket. Maybe it is the reason?

Fatal.PNG

You see the username is "hzhao" but my Bitbucket account username is "hzhao_xxxx". I tried putty and openssh. Both are failed.

[](https://community.atlassian.com/t5/Sourcetree-questions/Fatal-authenticate-error/qaq-p/99278?attachment-id=7427){#link_116a51adb2a3d6}  
[](/tnckb94959/attachments/tnckb94959/sourcetree-questions/2823/1/Fatal.PNG){#display_116a51adb2a3d6_0}


Answers:
author: Tim Crall
body: Click on the world icon in the upper right corner of the "Clone / Add / Create Repository" window. Then click on "Edit Accounts" and set your username (and password, if you like) to the correct values.