youngmon/atlassian-qna huggingface dataset:
Help with messed up repository (one remote, two local)
Asked by smXplorer:

I am usually doing some basic code development on one PC (A) and pushing that to bitbucket via Sourcetree.

On my production computer (B), I pull this locally and typically mostly use the code as is, occasionally fixing a few bugs and pushing back to the Bitbucket repository.

Recently, I found myself in a situation where, while on (B), I pushed some modifications to Bitbucket, only to discover that I had some pending mods on (A) as well. I committed those on A locally and tried to push that to Bitbucket, which obviously failed.

I tried some uneducated actions: pulling the remote (as the error message was suggesting this) and some additional merge of some kind, which I stupidly did not note down.

The result is that I am finding myself in the situation described below (on A), which prevents me from pushing any further modifications made on A.

Is there any simple course of action to reconcile A and the remote so that I can the pull the result to B?

![git problem.PNG](/t5/image/serverpage/image-id/132279i4A9D685F890C3EE9/image-size/large?v=v2&px=999 "git problem.PNG")

Edit:

Actually, here is the error message I get when pushing the A repo to Bitbucket in SourceTree:

git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks push -v --set-upstream origin master:master  
Pushing to <https://bitbucket.org/XXXXXXXXXX.git>  
To <https://bitbucket.org/XXXXXXXXXXX.git>  
! \[rejected\] master -\> master (non-fast-forward)  
error: failed to push some refs to '<https://bitbucket.org/XXXXXXXXXX.git>'

<br />

hint: Updates were rejected because a pushed branch tip is behind its remote  
hint: counterpart. Check out this branch and integrate the remote changes  
hint: (e.g. 'git pull ...') before pushing again.  
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Completed with errors, see above.


Answers:
author: smXplorer
body: While I can't say that I have quite understood how this works, I managed to get out this hole by following some of the UI 's suggestions, ending up with this situation:

![git probem solved.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/133962i0DB738D6ABD2E0C4/image-size/large?v=v2&px=999 "git probem solved.PNG")

The lesson I draw from this is to always pull from remote before working on a repo and always push after having worked on a repo. Whichever machine you are working on. Sort of...


Tags: git
Clone to Sourcetree from Bitbucket not working on Mac
Asked by Anthony Anthamatten:

I have a new MacBook which I am trying to clone a repository to sourcetree via ssh. I am able to see the repositories in Bitbucket, however when the Clone New dialog opens in sourcetree all I see is spinners. There is no error message but it cannot connect.

I created ssh keys on the MacBook and added them to Bitbucket and the MacBook keychain. Anybody have an idea about what is going on?


Answers:
author: foenix
body: have you manage this issue?


Tags: bitbucket

mac

ssh
Sourcetree Version 4.1.0(237) gui error
Asked by Vanson:

macOS Big Sur 11.2.1 (20D74)

![??2021-02-24 ??10.28.45.png](https://community.atlassian.com/t5/image/serverpage/image-id/131845iC9DD47DE46E993CF/image-size/large?v=v2&px=999 "??2021-02-24 ??10.28.45.png")![??2021-02-24 ??10.39.44.png](https://community.atlassian.com/t5/image/serverpage/image-id/131846iC76CB4476FD68F13/image-size/large?v=v2&px=999 "??2021-02-24 ??10.39.44.png")


Answers:
author: Peter Keller
body: This is a reported bug, see <https://jira.atlassian.com/browse/SRCTREE-7583>

comments: author: Vanson
body: thank you
How to I prevent SourceTree from killing Pageant?
Asked by CodionLtd:

SourceTree apparently recently added the "Automatically start SSH agent" option but even if I turn this off, it still KILLS the agent when SourceTree closes, which is quite stupid -- killing it even if you DID start seems silly, but killing it when you DIDN'T start it is surely just broken code.

Is it possible to fix this bad/broken behaviour?


Answers:
author: arnolem
body: <https://jira.atlassian.com/browse/SRCTREEWIN-13475>


author: Josh Kelley
body: SourceTree apparently goes by process name; I made a copy of pageant.exe called my-pageant.exe and launched it, and it stays running even after I close SourceTree.

Hopefully Atlassian will fix this behavior soon; for SourceTree to forcibly terminate processes that it doesn't start is very unwelcome.

comments: author: CodionLtd
body: Thanks for this observation - a useful work-around until Athlassian sort out their very anti-social behaviour! I think it's poor behaviour even if SourceTree launched Pageant, but indefensible behaviour when it /didn't/ launch it.


author: arnolem
body: I renamed the file \`\` pageant.exe '' but I still have the problem.

I think I will downgrade because it is unbearable.
Can' see the line number of the current file.
Asked by Muhammed Junaid TK:

While checking the line number of the current file and old file, I can see only old file line number, I can't see the line number of the current file. It is hidden. How can I fix this.<https://drive.google.com/file/d/1VVpzTAPxWdmEhF3aH4rx-06qCl_aROIF/view?usp=sharing>

In the screenshot you can see one line number is completely and other one is partially. I am facing this issue. Is there any option to resolve this ?


Answers:
author: liujinmu
body: I have the same problem, do you fix it ?


author: Nicholas Keene
body: FYI I had this problem in 4.2.0 but it is fixed in 4.2.2.


author: Muhammed Junaid TK
body: Didn't get any fix till now. Is there any fix from the **Sourcetree** side ?


author: Jeff Anderson
body: +1 Me too. Driving me nuts. There is nothing to drag that I can locate to resolve.

![Screen Shot 2022-01-06 at 11.40.21 AM.png](https://community.atlassian.com/t5/image/serverpage/image-id/176519i9F993063AB4E24FD/image-size/large?v=v2&px=999 "Screen Shot 2022-01-06 at 11.40.21 AM.png")


author: Brandon Jones
body: +1 I also have this problem and haven't yet found a solution.

![FAEM6dOVIAoQD_T.png](https://community.atlassian.com/t5/image/serverpage/image-id/162343i6842F6C10B9978BA/image-size/large?v=v2&px=999 "FAEM6dOVIAoQD_T.png")
How can I update to Sourcetree 4.1.0 - Major Release [19 February 2021]
Asked by Benjamin Durth:

Sadly I cannot update, the fixes mentioned in the release notes are long awaited.![CleanShot 2021-02-23 at 11.12.08.png](/t5/image/serverpage/image-id/131591i2A6BF5F2FEEF993D/image-size/large?v=v2&px=999 "CleanShot 2021-02-23 at 11.12.08.png")


Answers:
author: azaidman
body: Same issue here!

comments: author: Benjamin Durth
body: Ok, <https://sparkle-project.org/> is to blame

In the terminal:

```
sudo opensnoop -n Sourcetree
```

When updating, **Sourcetree_4.1.0_237.zip** shows up here for me:

```
~/Library/Caches/com.torusknot.SourceTreeNotMAS/org.sparkle-project.Sparkle/PersistentDownloads
```


author: Milos Kalab
body: Hi, good to know that it is Sparkle. But how can this answer be an "accepted answer" when it doesn't answer the original question - "how can i update"?


author: Benjamin Durth
body: I agree, IMHO only the developer can fix/update the installer (QA should test this before releasing :)

For me the task was to get my hands on the new version, which I could achieve.


author: Milos Kalab
body: What worked for me was getting rid of the old installation I got by using .dmg file and using homebrew instead.

```
homebrew install sourcetree
```

That worked perfectly smooth.


author: James Campbell
body: Same issue on MacOS Big Sur 11.2.1


author: Tarun Kothuri
body: Same issue on macOS 10.15.7

Error Log shows

com.torusknot.SourceTreeNotMAS 2021-02-23--12-13-01-607.log
>
> ```
> 2021-02-23 12:14:45 +0000 (e) [GIT] Unable to write file 'Dockerfile' at revision 7635bd92873e2326e504e4980a8b8829ce7a79a2 to /var/folders/qd/tvddk94x13l333mnd6s7zcb40000gn/T//Dockerfile_Before_7635bd92873e2326e504e4980a8b8829ce7a79a2.: fatal: Not a valid object name 7635bd92873e2326e504e4980a8b8829ce7a79a2:Dockerfile
> ```

![Screen Shot 2021-02-23 at 7.14.12 AM.png](https://community.atlassian.com/t5/image/serverpage/image-id/131622iCFD0BB8DF5A59953/image-size/large?v=v2&px=999 "Screen Shot 2021-02-23 at 7.14.12 AM.png")

comments: author: Benjamin Durth
body: When updating, **Sourcetree_4.1.0_237.zip** shows up here for me:

```
~/Library/Caches/com.torusknot.SourceTreeNotMAS/org.sparkle-project.Sparkle/PersistentDownloads
```
i can't push my commits in bitbucket
Asked by Daniel Chavez Vilchis:

Hello everyone,  
i have a little trouble when i try to push my commits.  
before this problem i push my changes with out problems, but i don't know what happened.  
when i try to push my changes, in the options doesn't apear the options in where branch i push my commits.![Captura.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/131383i66262E6A131BE467/image-size/large?v=v2&px=999 "Captura.PNG")  
![Captura2.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/131384i49F5810B64E77C53/image-size/large?v=v2&px=999 "Captura2.PNG")when i see this y try to push by console and it works but, only in one branch, when i try to push in other branch apear de following error:

    ! [rejected]        master -> master (non-fast-forward)error: failed to push some refs to 'https://bitbucket.org/cerevro/demo.git'hint: Updates were rejected because a pushed branch tip is behind its remotehint: counterpart. Check out this branch and integrate the remote changeshint: (e.g. 'git pull ...') before pushing again.hint: See the 'Note about fast-forwards' in 'git push --help' for details.

<br />

please somebody help me  
thanks a lot


Answers:
author: carlosughini
body: Hi Daniel,

Welcome to the community!

Git works with the concept of local and remote branches. A local branch is a branch that exists in your local version of the git repository. A remote branch is one that exists on the remote location (most repositories usually have a remote called `origin`). A remote equates roughly to a place where your git repository is hosted (eg. a GitHub/GitLab/BitBucket/self-hosted Git server repository instance).

Remotes are useful to share your work or collaborate on a branch.

"the tip of your current branch is behind its remote counterpart" means that there have been changes on the remote branch that you don't have locally.

There tend to be 2 types of changes to the remote branch: someone added commits or someone modified the history of the branch.

Please check the information above and let me know if it helps.

Regards,

Carlos

comments: author: Daniel Chavez Vilchis
body: Hello Carlos,

i search changes in the history and i don't need pull changes.

i search the history of the branch and i don't understand much, but i don't see nothing bad![Captura.PNG](https://community.atlassian.com/t5/image/serverpage/image-id/131526i5124E6E552514F91/image-size/large?v=v2&px=999 "Captura.PNG") i don't know if i searched correctly


Tags: bitbucket
I do enter my valid username and password but it through the error belove.
Asked by Naga Jyothi Vasapalli:

Command: git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks ls-remote <https://github.com/Deva2002/Airlines.git>  
Output:  
Error: remote: Invalid username or password.  
fatal: Authentication failed for '<https://github.com/Deva2002/Airlines.git/>'


Answers:
author: Patrick8639
body: I have the same error. It seems that this is because GitHub does no more accepts the "old" authorization method.

Unfortunately, I don't know if it is possible to change this in SourceTree...

comments: author: arbarnhart
body: I get the error with BitBucket, which makes it all the more frustrating. I know it's an open protocol, but SourceTree is more or less the "native" front end for BitBucket.


author: Nic Brough -Adaptavist-
body: What happens if you try the git command on the command line (outside Sourcetree)?

comments: author: arbarnhart
body: I am not the OP, but have exactly the same error. When I copy/paste the command into the command window it works. It asks me for user name and password and I use the exact same ones I have set up in SourceTree 3.4.2. I have removed and re-added the credentials several times. Usually, I would just type it both places but to absolutely ensure it isn't a typo I have gone through the sequence a couple of times using Google password manager as the source to copy/paste the password. Absolutely using the same username/password combo.

EDIT - It is SSH in both cases, but I have also tried HTTPS
why pull request don't work anymore?
Asked by Antoine Chalons:

I have the latest sourcetree and i can't create pull request anymore.

Very frustating because it used to work fine.

My repos are hosted on bitbucket, I have and SSH key configured, everything else works fine except pulll request creation.

If I go to properties of a repo, the account type is properly configured as "bitbucket account" for integration, but still... no luck with pull request.

I might switch to Tower


Answers:
author: Antoine Chalons
body: I've just installed the latest version of Sourcetree (3.4.3) and now pull request work again.


author: Danyal Iqbal
body: What error message do you get? Can you perform other operations? you might not have the rights to create a pull request.

comments: author: Antoine Chalons
body: thx for your answer

I do have the rights because now I go to the bitbucket website to do it from there directly

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


author: Antoine Chalons
body: and if I go to settings fromn that popup, it does show that it's linked to my bitbucket account,,, which should enable for extended support, but fails
Is there a way to adjust Tempo reporting to be in days, not hours
Asked by Elle Chippendale:

Is there a way to adjust Tempo reporting to be in days, not hours


Answers:
author: Nicolas Grossi
body: [@Elle Chippendale](/t5/user/viewprofilepage/user-id/4552077) It is not cpossible currently, see: <https://ideas.tempo.io/ideas/T-I-1278>

HTH

Nicolas


Tags: cloud

confluence-cloud
How to change datasource connection running on kubernetes
Asked by fb-standard-anwendungen:

Hello :-)

If I adjust the database URL in values.yaml and sync it to Kubernets, the configuration (database URL) in confluence.cfg.xml does not change. Now there is the parameter "forceConfigUpdate" in values.yaml. This corrects the database URL, but unfortunately also generates a new server ID and more. So for me this parameter "forceConfigUpdate" cannot be used to adjust the database URL. I then manually adjusted the database URL in the confluence.cfg.xml file, which works, but what is the official way from Atlassian for Confluence? I only found these two links, but they are not applicable for our Kubernets environment (<https://confluence.atlassian.com/doc/configuring-a-datasource-connection-937166084.html> and <https://confluence.atlassian.com/confkb/how-to-generate-a-new-confluence-cfg-xml-425461512.html>). Thank you very much for your feedback


Answers:
author: Yevhen
body: [@fb-standard-anwendungen](/t5/user/viewprofilepage/user-id/5415345) can you please elaborate on "generates a new server ID and more". If you deploy a clustered Confluence environment, there must be confluence.cfg.xml in shared home which contains some data like server id, license etc. It should be absolutely safe to regenerate confluence.cfg.xml in local home at any time.

comments: author: fb-standard-anwendungen
body: I am currently still in the test phase and therefore Confluence is running as a single node configuration. Don't worry, the confluence.cfg.xml file is persistent. This is also generated/configured once (during the initial setup) with the correct values from the values.yaml. However, if I now want to change the database URL, I assumed that I would only have to change this in values.yaml (which would actually be the case according to Kubernetes). But after syncing the new values.yaml, the changes are NOT applied, even after a pod restart. I can of course delete the statefulset (but you shouldn't do that :-)) or set the parameter forceConfigUpdate to true (but you shouldn't do that in a running environment either because a new server ID will then be generated and more!) But how do you do it then? I need an official way from the manufacturer to make sure ;-).


author: Yevhen
body: forceConfigUpdate is the official way.


author: fb-standard-anwendungen
body: thanks for the answer


Tags: confluence-data-center

data-center

database-connection

kubernetes
Groups are not appearing for the space under Custom Space User Management feature
Asked by Eddie Cardona:

The space has 12 groups created. But when you go to the Custom Space User Management feature to add a user the list of groups does not populate. The groups do appear under Space Permissions =\> Groups.

Please advise.

Ed


Answers:
author: Ryan Clifton
body: Hello Eddie,

- Could you please clarify the naming format the Groups are using?

As CSUMC will only display groups that matches the **Space group pattern** that is configured within CSUMC's System Admin configuration. By default the **Space group** **pattern** is set to "{SPACEKEY}-{NAME}", this would mean that the Groups would require the SpaceKey to be at the start of the Group name in order for CSUMC to show the group in the Space Admin view.

As Denny, mentioned if you require any further assistance, then feel free to use our support Portal to create a support ticket or you can email support@thepluginpeople.com

Regards,

Ryan (PPL Support)

support@thepluginpeople.com


author: Denny Miller
body: Hi Eddie,

To clarify on the previous comment:

- Space Groups are groups that match the configured Space Group Pattern. The groups visible **are also real confluence groups, and should be visible through space permissions group configuration**.

- Delegated groups are not yet available in CSUMCloud.

I would suggest [raising a support](https://thepluginpeople.atlassian.net/servicedesk/customer/portal/1) with the team, including your site you are experiencing the issue. If you are not seeing the groups you expect, our team will be happy to assist you with this if you raise a support ticket with your spaceGroupPattern, and the groups you are expecting to see within a given space.

(If this is not for the Cloud version of CSUM, feel free to reach out through the support portal for CSUM Server/Data Center).


author: Shawn Doyle - ReleaseTEAM
body: These are two different types of groups. The ones you see thru the Space permissions are real Confluence groups, the ones you are not seeing in CSUM are CSUM groups and would be empty till you create them.

Space Groups: specific to and managed by the Space Admins

Delegated Groups: groups that are specifically nominated for management through CSUM Space Admin UI (ie they have to be a Space admin somewhere, even in their Personal Space!)


Tags: cloud

confluence-cloud
Gliffy: Shapes are automatically connecting to Arrows.
Asked by Ankit Sinha:

I am trying to add shapes over existing arrows. I do not want this new shape to automatically break the arrows into two and get connected. I only want to place this shape over the diagram. I am facing this issue since today.


Answers:
author: Samie Kaufman - Your Gal at Gliffy
body: Hi [@Ankit Sinha](/t5/user/viewprofilepage/user-id/5523384) ! You're correct that this is a change we recently implemented in Gliffy Diagrams for Confluence Cloud. The intention is to make it easier to build out your diagram, but I understand that it's an adjustment to get used to as an existing Gliffy user!

Would you mind reaching out to me directly so that I can review the specific behavior you're experiencing and make sure things are working as expected for you? I can also get some details about the auto-disable option you suggested and log that as a request.

My email is skaufman@perforce.com. :)


author: Bastian -drawio Diagrams-
body: Hey Ankit. Which tool are you talking about? Confluence whiteboards or a diagramming app?

comments: author: Ankit Sinha
body: Gliffy for Confluence cloud. I noticed some new update was released:  

[What's New in Gliffy's Confluence \& Jira Apps \| Gliffy by Perforce](https://www.gliffy.com/products/gliffy-atlassian-apps/whats-new)

Basically I want to disable this auto-feature


author: Bastian -drawio Diagrams-
body: Hi Ankit. Unfortunately, I can't provide a solution, as it's not one of our features. But our colleagues at Gliffy will probably help you out soon :)


author: Samie Kaufman - Your Gal at Gliffy
body: Jinx, [@Bastian -drawio Diagrams-](/t5/user/viewprofilepage/user-id/637202)? Happy Tuesday!


Tags: cloud

confluence-cloud
A Tale of two Jira instances and one Confluence instance
Asked by sseifried:

Hello,

so my company has one big Confluence instance, which in turn is connected to two separate Jira instances. This rather bizarre constellation is due to the organizational structure (subsidiary with own jira). But hey, it works.

There is one little caveat which really bugs me, and even our consultant says there is no solution. I constantly get a notification to authorize the Jira instance of the subsidiary. I do not even have the proper permissions to do so. I'm pretty sure this can be avoided somehow. Can anybody share any light on this?

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

Thanks,  
Stefan


Answers:
author: Kristian Klima
body: Hi [@sseifried](/t5/user/viewprofilepage/user-id/2570456) and Welcome to the Community.

I have experience with two Confluences and one Jira on both the Server and the Cloud.

Sharing my experience hoping it might point you in a viable direction.

I get a similar message (in English) in the following scenario.

I have a Jira ticket with 5 users somehow involved. Out of those 5 users, 3 have access to both Confluences (let's call them A and B), 2 can only access on Confluence B.

When I share a link to Confluence A, Jira prompts me to authorize/give access to those two individuals who can only access Confluence B.

comments: author: sseifried
body: Hi [@Kristian Klima](/t5/user/viewprofilepage/user-id/5074962)

thanks for taking the time to give such a detailled answer.  

So, your explanation makes perfect sense to me. And, I'm pretty sure that it is not feasible to completely separate our companies confluence instance in two isolated areas only serving a single jira. Given that fact, there is probably no way to permanently discard this notification?

From my experience, every time I discard this message ("Verwerfen" button), it eventually pops up again after some time. Which is the reason why I find this notification so annoying. From my understanding of your explanation, I assume that the notification is retriggered as soon as new content (involving both jira instances) is created. Which makes logical sense, but is still annoying to me.


Tags: confluence-data-center

data-center

jira
Why are macros (database, Atlas) blurry when embedded?
Asked by Nerissa:

Can you help me understand why embedded views are just slightly blurry? Is there a setting that I'm missing somewhere?

I want to embed a database and some Atlas content into a Confluence page, but the views are not quite sharp. The container headers are fine, but the content is just blurry enough for me to think I need to get my eyesight checked!

Here's an example (although it's difficult to really see from the screenshot):![image.png](/t5/image/serverpage/image-id/330394i0657D637FC94300A/image-size/large?v=v2&px=999 "image.png")


Answers:
author: Shawn Doyle - ReleaseTEAM
body: I'm not seeing a blurriness. I do wear glasses tho.

comments: author: Nerissa
body: In the meantime I reached out to support, it's a [bug](https://jira.atlassian.com/browse/CONFCLOUD-78878).


Tags: cloud

confluence-cloud