youngmon/atlassian-qna huggingface dataset:
Will merging two PRs overwrite each other?
Asked by Claudiu Argeseanu:

my colleague and I are working on updating the same code file, using separate branches.

We initially branched from master at the same point (say commit A) , and created PRs at the same time.

Now, my colleague managed to merge first to master, bringing the code file to commit B.

My question is what happens if I merge my PR to master?

- will my PR overwrite his work, resulting in commit A + my work?

- will my PR add to his already merged work resulting in commit B + my work?

I should specify that no CONFLICT is displayed on my PR after his merge. I guess that happens because we worked on separate parts of the file:

- he modified rows 100 to 150

- I added new rows 400 to 500 to the file

Should I merge master (commit B) in my branch and then merge my branch to master to be sure nothing gets overwritten?


Answers:
author: Ulrich Kuhnhardt _IzymesCo_
body: Hi [@Claudiu Argeseanu](/t5/user/viewprofilepage/user-id/5246089) - welcome to the community.

You can rest assured that Bitbucket or git for that matter will **not** override changes already merged. Hence it is called a **merge** and not a write.

Each merge is an atomic operation. Even if you were to *write (push)*to master git/bitbucket won't let you (unless you use the --force push option).

Hope the helps.

Best, Ulrich

// [Izymes](https://marketplace.atlassian.com/vendors/1210584/izymes-pty-ltd)


Tags: bitbucket-server

server
Unable to remove an existing user from user directory
Asked by Shubham Sourav:

I get this error when I try to remove an existing user.

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

Please assist.


Answers:
author: Theodora Boudale
body: Hi [@Shubham Sourav](/t5/user/viewprofilepage/user-id/5245233) and welcome to the community.

I suspect that the reason you cannot remove this user may be that it's their personal workspace.

Could you please let me know the first two letters of the user's name so I can double-check?

Kind regards,  
Theodora

comments: author: Shubham Sourav
body: Hi Theodora!

Thank you for reaching out.

The first 2 letters are GA.


author: Shubham Sourav
body: Hi [@Theodora Boudale](/t5/user/viewprofilepage/user-id/818086)

I needed to know if my repositories will be affected if we delete the same user.

Thank you!


author: Theodora Boudale
body: Hi [@Shubham Sourav](/t5/user/viewprofilepage/user-id/5245233),

Thank you for the info.

The reason that you cannot remove this user is that this workspace is the user's personal workspace. Up until a few months ago, when someone created a Bitbucket Cloud account, Bitbucket would automatically create a workspace for their user. That was a user's personal workspace. We have since changed this functionality and now Bitbucket doesn't automatically create a personal workspace when someone creates an account. However, the personal workspaces before this change was introduced still remain.

I'm afraid that it is not possible to remove a user from their own personal workspace. What you can do instead is create a new workspace, transfer all the repositories from the existing workspace to the new one, and set up user access there.

You can check the following documentation on how to transfer repos:

* <https://support.atlassian.com/bitbucket-cloud/docs/transfer-repository-ownership/>

If you want to keep the same workspace id, you can change the workspace ID of the existing workspace to something else to free up the ID. Then, you should be able to create a new workspace with the existing ID.

Please feel free to let me know if you have any questions.

Kind regards,  
Theodora


Tags: bitbucket-cloud

cloud
Publish from Bitbucket Pipline to Azure Devops Symbol Server
Asked by John Crawford:

Hi,

I am using Bitbucket Pipelines as my build process and publishing my nuget packages to an Azure DevOps Artitfact Feed

What I would like to do is also publish the Symbols to the Azure Symbol Server to allow for debugging of my nuget packages.

If doing the build in Azure devops, publishing the symbols is easily done via the instructions provided here:

<https://learn.microsoft.com/en-us/azure/devops/pipelines/artifacts/symbols?view=azure-devops>

And this Yaml  

```
- task: PublishSymbols@2
      inputs:
        SearchPattern: '**/bin/**/*.pdb'
        SymbolServerType: 'TeamServices'
```

So the question, how do I publish my symbols from a bitbucket pipeline to Azure Symbols Server, what is the Bitbucket equivalent of the above?

Cheers


Answers:
author: Igor Stoyanov
body: [@John Crawford](/t5/user/viewprofilepage/user-id/1941339) hi. There is no equivalent to <https://github.com/microsoft/azure-devops-symbols> in bitbucket pipelines. However, you could try to use azure cli and write your custom solution in bitbucket pipelines.  
In example: [pipeline-artifacts with azure-cli.](https://learn.microsoft.com/en-us/azure/devops/pipelines/artifacts/pipeline-artifacts?view=azure-devops&tabs=azure-cli)  

```
script:  - pipe: atlassian/azure-cli-run:1.1.0    variables:      AZURE_APP_ID: $AZURE_APP_ID      AZURE_PASSWORD: $AZURE_PASSWORD      AZURE_TENANT_ID: $AZURE_TENANT_ID      CLI_COMMAND: 'az pipelines runs artifact upload --artifact-name 'test' --path <path> --run-id '<run-id here>''
```

Regards, Igor

comments: author: John Crawford
body: Thanks [@Igor Stoyanov](/t5/user/viewprofilepage/user-id/4550492) , I will have a go and see what I can come up with if I get it working I will post back here.


Tags: azure

bitbucket-cloud

bitbucket-pipelines

cloud
How can I increase the memory of a step running on a self-hosted runner above 1024mb?
Asked by Marvin Heilemann:

I would like to increase of all steps running on our self-hosted runners. Currently, even with "2x" all run just at 1024mb which is just low. Is there no option? Increasing it to 4gb would increase the build time a lot for tests which require a lot of RAM.


Answers:
author: Marvin Heilemann
body: Oh ok, found it, on self-hosted you can set "4x" and "8x" for more, nice. This seems to work:

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


Tags: bitbucket-pipelines

bitbucket-server
request to run gc on my repository
Asked by Gursimar Singh:

Please run garbacge collector on my repo:

<https://bitbucket.org/>\<workspaceID\>/\<reposlug\>  

I have enabled the feature from labs but still the size of the repo has not been reduced.


Answers:
author: Ben
body: G'day Gursimar!

Thank you for contacting Bitbucket Cloud Support.

I have executed a gc and it has reduced the repository by 300mb.

If you would like to reduce the size further, I would suggest executing the following command first to find your largest files and keep note of their extension:

```
git rev-list --objects --all \
| git cat-file --batch-check='%(objecttype) %(objectname) %(objectsize) %(rest)' \
| awk '/^blob/ {print substr($0,6)}' \
| sort -r --numeric-sort --key=2 \
| numfmt --field=2 --to=iec-i --suffix=B --padding=7 --round=nearest
```

Once you have found these large files, we have a guide for either removing these or converting them to GIT LFS storage using the BFG tool:

* <https://support.atlassian.com/bitbucket-cloud/docs/reduce-repository-size/>

The reason for making use of GIT LFS with the BFG Tool is that whenever you store larger files in your repository, the full size of these files are added each time to all subsequent commits. Converting files to GIT LFS will change these files in your repository commit history to pointer objects which will reference these files in GIT LFS storage rather than storing them each time in your commit

**NOTE:** I have removed your workspaceID/repository slug from your question as this is a public forum.

Cheers!

- Ben (Bitbucket Cloud Support)


Tags: bitbucket-cloud

cloud
Bitbucket restarting every 10 minutes
Asked by pozhilou:

/opt/atlassian/bitbucket/bin/_start-webapp.sh: line 120: 306 Killed $JAVA_BINARY $JAVA_OPTS $LAUNCHER start --logging.console=true

Stopping bundled Elasticsearch  
Bundled Elasticsearch has stopped  

Bitbucket restarting every 10 minutes with this error.


Answers:
author: pozhilou
body: After change external port in docker compose from 7990:7990 to 7420:7990 - all works


Tags: bitbucket-server

server
Not receiving any mails about repositories anymore
Asked by Glenn:

Hi,   

I am not receiving emails anymore since a couple of weeks (pull requests updates, comments and merge update) on my email id **glenn.delanghe@glenndelanghe.be**   

Please help   

Delanghe Glenn


Answers:
author: Ankit Anway
body: Hi Glenn,  

Welcome to the Community !!

We performed an analysis on our logs and confirmed that your email had a block that prevented emails from being sent to, as you can see here :

++*554 5.7.1 \[internal\] recipient address was suppressed due to customer policy*++

We've removed this block from your email. Could you test if you receive emails from new notifications of pull requests now?

Please, feel free to share any additional questions or concerns regarding this case. We'll be here to help.

Thanks,   
Ankit


Tags: bitbucket-cloud

cloud
Unable to load Sourcetree 2.3.1 on my development PC. The older version is needed to be compatible w
Asked by Patrick T. Capwell:

My development PC has Windows 10 LTSB and is not compatible with the newer .NET framework (4.7.2). I'm trying to install Sourcetree 2.3.1, which is compatible with .NET framework 4.6.2, which I have. Installation starts but when asked to use and existing account or "Go To My Atlassian" it gives a blank screen for "use an existing account" If I select "Go To My Atlassian" I get a screen showing my licenses but I cannot proceed with the installation. Please help ASAP. This has caused a 4-day delay on our project. Thank you!


Answers:
author: Mike Corsaro
body: Hello! It [looks like .NET 4.7.2 does work with the Win10 1607 LTSB release.](https://support.microsoft.com/en-us/help/4054590/microsoft-net-framework-4-7-2-for-windows-10-version-1607-windows-10-v)

Would it be possible to get your admin to allow the update?

Thanks!

comments: author: Patrick T. Capwell
body: Update not needed. After hours of not hearing anything back from Atlassian and searching endlessly for a phone number to call, I found the answer in an Atlassian Community post about copying the accounts.json and password files into the Sourcetree folder.


author: bgannin
body: Hi [@Patrick T. Capwell](/t5/user/viewprofilepage/user-id/3085252),

Unfortunately we had to disable the registration methods used by prior Sourcetree releases with the 3.0 release. The licenses on "My Atlassian" are deprecated as well, they existed for the 1.x timeframe. The only solution is to be on a system with .NET 4.7.2 and to use the most recent update to ST as well to ensure you've got the latest features, bug and security fixes. Our sincerest apologies for the interruption to your workflow.

Brian Ganninger  
Principal Developer, Sourcetree
Connecting Azure DevOps to SourceTree
Asked by Cody Eldredge:

I keep getting the following error no matter what I do when trying to connect my DevOps:

Authorization Failed

Failed to check login for user \[myaccount\]

TF14045: The identity with TeamFoudationId

c6f050f4-6a40-6d41-8850-34e018d535ca could not be found

I have tried using both versions of the URL as well.

Does anyone have a solution for this?


Answers:
author: minnsey
body: Hi  

Currently you will need to use the old style URL. Have you been using a Personal Access Token rather than your user password?
I cannot log into Bitbucket.
Asked by Jason Thiel:

1. Using Source Tree 3.1.2 on Mac

2. We have local instance of bitbucket. I can log into it with my credentials via the bitbucket web UI.

3. Upon sourcetree startup, everything is fine, i see my repo. I need to connect to a new repo....

4. in sourcetree: Sourcetree-\> Preferences-\> accounts -\> Edit the existing account that i have had for a year. First, it gives me my email address as username. No matter. I have tried my username/password, my email/password, my old password ( i changed my BB password today). Using basic auth and ssh protocol.54.

5. I get a popup entitled "Authenticate". it has the correct user name. I type in the correct password.

6. I get error:

We couldn't connect to Bitbucket with your (jthiel) credentials. Check your username and try the password again.

7. I have repeatedly logged into the bitbucket ui, so I know my password is correct.


Answers:
author: Ana Retamal
body: Hi Jason, thanks for the step by step description.

I can see that you're having trouble to connect Sourcetree to Bitbucket. We'll still need some more information to be able to pinpoint this issue, could you answer the following?:

1. When you say you have a local instance of Bitbucket, do you mean Bitbucket Server? If so, can you confirm you're selecting the right option during the authentication?
2. Can you also let us know f you're using 'Embedded Git' or 'System Git'? Which Git version do you have?
3. Can you check the Sourcetree logs and let us know if there's any other valuable information there? You can find them by opening the Console application (`Applications >> Utilities >> Console`) and searching for entries related to "SourceTree".

Kind regards,

Ana

comments: author: Jason Thiel
body: I got around the issue finally.

I had the repo pulled locally from git cmd line so it already existed on my local machine, just not in source tree.

From the little screen i initially see when i start source tree (the one that lists my repositories) i clicked the "Add Existing Local Repository" this allowed source tree to see the repository.

I'm not sure that this makes sense but it seems to work.


Tags: mac
SourceTree Error Message in Log "NPS: Couldn't record shown prompt"
Asked by A:

We are encountering this message in the sourcetree log after upgrade of Sourcetree to version 3.1.2 (Enterprise version). Would like to know how to resolve it.

We are using VDI, and I have simulated the same version of SourceTree in another instance of VDI, but is not able to replicate it.
>
> ERROR \[2019-04-23 17:34:15,612\] \[43\] \[SourceTree.Analytics.NPS.Service.NPSFeedbackService\] \[Log\] - NPS: Couldn't record shown prompt  
> System.NullReferenceException: Object reference not set to an instance of an object.  
> at SourceTree.Analytics.NPS.Transport.AuthHttpClientHandler.\<SendAsync\>d__2.MoveNext()  
> --- End of stack trace from previous location where exception was thrown ---  
> at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()  
> at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)  
> at System.Net.Http.HttpClient.\<FinishSendAsyncBuffered\>d__58.MoveNext()  
> --- End of stack trace from previous location where exception was thrown ---  
> at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()  
> at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)  
> at Refit.RequestBuilderImplementation.\<\>c__DisplayClass17_0.\<\<BuildVoidTaskFuncForMethod\>b__0\>d.MoveNext()  
> --- End of stack trace from previous location where exception was thrown ---  
> at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()  
> at System.Runtime.CompilerServices.TaskAwaiter.HandleNonSuccessAndDebuggerNotification(Task task)  
> at SourceTree.Analytics.NPS.Service.NPSFeedbackService.\<RecordShownPromptAsync\>d__18.MoveNext()

Thanks in advance.


Answers:
author: bgannin
body: Hi [@A](/t5/user/viewprofilepage/user-id/555506),

This is harmless debug logging related to us recently disabling the in-app surveys. It will be removed in a future update.

Brian Ganninger  
Principal Developer, Sourcetree
"Advanced" tab in "Preferences" is disabled with Russian?
Asked by Slava Gerchicov:

Why Advanced tab is disabled for Russian language?


Answers:
author: Katsuhiko Terada
body: "Advanced" tab is also disabled in Sourcetree 4.1.0 in Japanese.

And switching to "English" fix this problem.


author: minnsey
body: Hi  

What version are you running?

comments: author: Eduard Veykum
body: OS X Mojave 10.14.5. SourceTree updated to the last one - problem still present. Switching to "English" fix this problem.
[mac] hooks run python script with python2 (/usr/bin/python)
Asked by ppp:

I installed python3 by pyenv, and set the global version to py3, so when I run "python --version" in shell, I'll get "Python 3.7.0"

but when I use a py script for pre-commit hooks, this script is run by py2, how can I make sure the python env to py3?


Answers:
author: Ana Retamal
body: Hi, welcome to the Community,

This is a forum for Atlassian products, but I'm not sure if you're using any of our products, or you just have a question about Python?

If your question is related to one of our products, can you specify which one are you using and maybe send some screenshots so we can see the problem you're facing?

Otherwise, you'll have more chances of getting help with your question if you post it to a different kind of forum, like Stackoverflow for example ;)

let us know if there's anything we can do for you!

Best regards,

Ana


Tags: mac

python
Refreshing remote repositories failed / Bitbucket - SourceTree
Asked by anicolasgarcia:

I am having this error over and over,

Signing in, a white windows pops up completely empy.

Tried changed delete account and create it again, didn't work.

tried change protocol HTTPs to SSH, didn't work.

Tried re-install SourceTree, didn't work.

SSH key is the same than the one in Bitbucket.

![Screen Shot 2019-04-23 at 2.24.34 pm.png](/t5/image/serverpage/image-id/52249iD28A99F530DD3AC1/image-size/large?v=v2&px=999 "Screen Shot 2019-04-23 at 2.24.34 pm.png")![Screen Shot 2019-04-23 at 12.54.28 pm.png](/t5/image/serverpage/image-id/52250i05B144424F40E2E2/image-size/large?v=v2&px=999 "Screen Shot 2019-04-23 at 12.54.28 pm.png")


Answers:
author: Paola Pagotto
body: I'm having the same error! So annoying... I can't fix it no matter what I try or do


author: Ana Retamal
body: Hi Nicolas,

Thanks for the detailed description and the screenshots.

When you re-installed Sourcetree, did you make sure to wipe the Sourcetree preferences? You can find the instructions [here.](https://confluence.atlassian.com/sourcetreekb/how-to-wipe-sourcetree-preferences-412484640.html)Can you try that and let us know if it worked for you?

Also, for troubleshooting purposes, can you tell us if you're getting any issues when trying HTTPS instead of SSH?

Kind regards,

Ana


Tags: authority

mac

ssh
Why is Commit not working?
Asked by Glenn Tassin:

I select a bunch of new files to commit, then try to commit.

I get the popup saying "Checking submodules" for less then a second, then it closes, and comes back to the main UI with nothing checked in.

I can check in files to the repository by hand from the terminal, so the repository isn't the issue.

This is on Windows 10 with a repository on a Windows network share. SourceTree 3.1.2, although this has happened to me a few times on earlier versions of 3. Previously, checking in a commit by hand shook it loose...this time, no dice.

Also, I have tried it both with the "Push changed immediately" checked and not. I have tried rebooting.


Answers:
author: minnsey
body: Hi  

Can you raise a ticket at <https://jira.atlassian.com> for us to investigate? Any additional details, e.g. do you have any submodules, Git version etc would be useful
Accessing Safari safe browsing cache?
Asked by kraybit:

Hello!

Just created a brand new local repository. This happened immediately when the window for it opened:

![Screenshot 2019-04-20 at 15.33.15 .png](/t5/image/serverpage/image-id/52139iA2ACAEF71D62B8EC/image-size/large?v=v2&px=999 "Screenshot 2019-04-20 at 15.33.15 .png")

Transcript:

\[A dialogue-box on top of repository window\]

'hg status' failed with code 255:'abort: Operation not permitted: '/Users/oscar/Library/Caches/com.apple.Safari.SafeBrowsing'

\*\*

Ehm, wut? As I closed the dialogue box, it kept reopening for a few times. Should I be concerned?

Kind regards

/Oscar


Answers:
author: kraybit
body: Ok, it's human error.

Turns out I accidentally made my entire home folder into a repos, so obviously it tried to go through ALL my files, including files with special permissions. I guess the fact the safe browsing cache has special permissions is actually reassuring : )

Note: I thought the name of the repos would be added to the path, when creating a new repos. That's how it happened.

Cheers!


author: bgannin
body: Hi [@kraybit](/t5/user/viewprofilepage/user-id/3066624),

We haven't had any reports of this before. The 'status' command is used with Mercurial to get the current information about the repository. The error shown is coming directly from Mercurial. Does it still occur if you switch from "Embedded Mercurial" to "System Mercurial" in the preferences?

Brian Ganninger  
Principal Developer, Sourcetree

comments: author: kraybit
body: Thanks for your reply Brian. I found the "bug", see other answer. Thanks again.


author: bgannin
body: [@kraybit](/t5/user/viewprofilepage/user-id/3066624), glad to hear you found the root cause. Thanks for updating and sharing the solution!
Slow Source Tree on Windows 10
Asked by PatrickVasconcelos:

I'm using Source Tree on Windows, but it's too slow to respond to any click, for instance, to open Git Flow. I tried to update the embedded git but the download failed. I also tried reinstalling, but the problem continues.


Answers:
author: Mike Corsaro
body: Hello! Is there any chance you're using a 4K monitor?

If not, do you have any anti-virus that's known to cause issues?

Additionally, collecting some performance logs would help:

* Open the slow repository
* Go to "Repository \> Benchmark Repo Performance"
* Upload that file and link it here

Thanks!

comments: author: PatrickVasconcelos
body: Hi!

I'm not using a 4k monitor and the anti-virus is the bitdefender.

I'm new to git stuff and couldn't find the Benchmark Repo Performance that you said. what can I do to find the file?

I just realize the git bash is also slow in the repository, so this is not a problem with Source Tree, right?

Anyway, I could use some help.

Thanks (sorry for my english)
feature
Asked by DEVAMIT@2021:

cannot create a feature in source tree instead it makes a branch


Answers:
author: bgannin
body: Hi [DEVAMIT@2021](/t5/user/viewprofilepage/user-id/3060067),

A few questions to help us get the root of the problem:

\* What version are you using?

\* On what OS?

\* This is using Flow, correct?

\* Is it with Git or Mercurial?

Brian Ganninger  
Principal Developer, Sourcetree

comments: author: DEVAMIT@2021
body: Os: windows 10 64 bit

Is with git

Version :latest downloaded from atlassian
Can not install Sourcetree on Window 7 32bit
Asked by khanhnhat1997:

I have a trouble when I install sourcetree on windows 7 32bit, When i run .exe file to install, it always show dialog error: Install has failed - Failed to extract installer. Help me pls![failed.png](/t5/image/serverpage/image-id/51937i2041ED502D4755A7/image-size/large?v=v2&px=999 "failed.png")


Answers:
author: nhatphat
body: The same question -\> "H?ng :v"