youngmon/atlassian-qna huggingface dataset:
How to merge branches with --no-ff flag using SourceTree?
Asked by Dmytro Shchurov:

Browsed the knowledge base, read documentation, tried to find such option in the application, but without success.  
I need to merge branches with no fast forward option. Please help me to avoid using console every time I have to merge them )


Answers:
author: Louis des Landes
body: Preferences for git has an option

"Do not fast forward when merging, always create commit"

comments: author: Dmitri Shchurov
body: This is what I'm looking for! It's so sad that I cannot give you an 'answer' point.


author: Bal?zs Szakm?ry
body: You can accept multiple answers.


author: Dmytro Shchurov
body: Another me sees this option -) I asked from my personal account, but then continued with my company one. But the answer is still can be assigned only to a single coment.


author: Bal?zs Szakm?ry
body: In the old Answers it was possible to accept two answers, maybe not in the new one.


author: Bal?zs Szakm?ry
body: Another possibility (if this is really missing form the Mac version) is to create a [custom action](http://blog.sourcetreeapp.com/2012/02/08/custom-actions-more-power-to-you/) to do this.

comments: author: Dmytro Shchurov
body: Oh! I've really missed it! This might help. Thank you.


author: Bal?zs Szakm?ry
body: In the "Confirm merge" dialog, there is a checkbox: "Create a new commit even if fast-forward is possible". If you leave this unchecked, it uses --no-ff.

comments: author: Seth
body: I think you mean, "if you check this". Unchecked = "FF if possible", Checked = "Never FF".


author: Dmytro Shchurov
body: Thank you friends, but there is no such option on the 'Confirm' dialog in Mac OS X version (1.9.5).

There are only 'Commit...' and 'Include messages...' check boxes there.


author: Bal?zs Szakm?ry
body: Yes, you are right. Checked =\> -no-ff


author: dpstandish
body: They still don't seem to have this in mac version.

This script works as custom action:

```
#!/bin/bash

branch_name=$(egrep -lir $1 .git/refs/heads/feature/* |head -1|sed -e 's/.git\/refs\/heads\///')

git merge $branch_name --no-ff --no-edit
```

If you have multiple branches at that commit, behavior is uncertain.
How many times will you screw up SourceTree and ship it anyway?
Asked by thoran:

I've taken to keeping old copies just it case it fucks up again. It's every other month. Don't you test against the claimed supported platforms? It makes Atlassian look crap.


Answers:
author: Nic Brough -Adaptavist-
body: There's no real question here. If you're having issues with upgrades, perhaps explaining them and raising support requests might be more useful.

We're not Atlassian support, so you're having a go at the wrong people anyway.
SourceTree always rebasing.
Asked by roberto_sc:

I'm using SourceTree for Windows, v1.5.2.0.

SourceTree is always rebasing when I do a git pull. The option "Rebase instead of merge" is not marked on both pull options and git options.

It seems that the only way to merge is doing a fetch and a merge. Am I missing something?


Answers:
author: Seth
body: How do you know it is rebasing and not fast-forwarding?

comments: author: roberto_sc
body: Hmm I thought it is rebasing because it never allows me to do it when I have uncommitted changes, I always have to stash them before, while merging normally allows me to do it while having changes. But now I'm confused about this. I normally work with more than one thing at the same time so I always have uncommitted changes, it's a pain to stash, pull, apply stash.


author: Seth
body: Rebase, fast-forward, and merge have nothing to do with uncommitted changes. You rightly need to clear those out of the way before performing those operations. In some situations, it may be more appropriate to commit them than to stash them.

If you have any commits that have not been pushed, then a pull will need to either merge (default) or rebase. If you don't have any new commits, a pull will attempt to fast-forward (default) unless you explicitly tell it not to, in which case it will create a new merge commit.


author: Veselin Kolarov
body: Have the same problem. Each time I try to pull I'm getting the error message "Cannot pull with rebase: you have unstaged changes.".

The checkbox "Use rebase instead of merge" is unchecked.

Here the Sourcetree log:

git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree pull --no-commit origin master  
error: Cannot pull with rebase: You have unstaged changes.


author: Veselin Kolarov
body: "git pull --no-rebase" in the shell works.


Tags: merge

windows
Network performance
Asked by Mike Yearwood:

SourceTree was working very fast for me completely locally. Thinking how to include team members, I attempted to put a set of files on the server and make a repository there and found it unbearably slow.

The [documentation](https://confluence.atlassian.com/display/SOURCETREEKB/Troubleshooting+Performance+Problems+in+SourceTree) says to have repositories on the local drive. In a team environment, do the other developers clone from a first developer's repository? Once they do that, are there going to be performance problems as if the repository is on the LAN?

Thanks

Mike


Answers:
author: Seth
body: Also, this is a separate question. Moving...


author: Seth
body: Additionally, there is no reason you can't but a repository on a local server. But instead of interacting with the repository and its files directly (by mounting as local storage), you (and all other devs) should *clone* that repository over https or ssh. Then you have a local repository for standard operations, and push/pull from the centralized server to keep in sync.


author: Seth
body: If you don't have a central server, then other developers should clone from each other. I have no experience with this type of configuration, but you won't have the same performance problems as before.

Keep in mind that when another developer clones your repository, yours becomes a "remote" (designed to be on the LAN or WAN), but a copy of the ENTIRE repository now exists on the developer's local machine. Commits, checkouts, merges, project trees, and status are all local-only operations. Pushes and pulls interact with remote repositories.

Check out [Chapter 5 of the Git book](http://git-scm.com/book/en/Distributed-Git).


author: Mike Yearwood
body: OK. Even more info. One of the binary files was open exclusively. SourceTree was waiting for the file to be released, not trying to diff it. I could either remember that detail or SourceTree could give up after a few seconds and give an error message. Thank!


author: Mike Yearwood
body: Welll. I have to amend that. Adding many files to the repository and then trying to stage them was slow. We have certain binary files. The problem seems to be with SourceTree attempting to diff them. Can we tell SourceTree not to diff specific files, but still track them/not ignore them?
Render HTML
Asked by Matt Pease:

I want to paste html code I have written into Confluence, and have it render like a browser would. My code includes css and javascript popups.

All I am finding are things that allow me to pull html from some external site and embed it in my confluence page- NOT what I want.

Does what I want exist?

Thanks


Answers:
author: Brant Schroeder
body: [@Matt Pease](/t5/user/viewprofilepage/user-id/5269992) Welcome to the Atlassian community

There is not any way to add HTML, JS, and CSS within Confluence. You are correct that the only way to add that type of content is through iframes and the content has to be hosted outside of Confluence.

comments: author: Brant Schroeder
body: I just found this app that might work for you [https://marketplace.atlassian.com/apps/1221472/html-macro-for-confluence?hosting=cloud\&tab=overview](https://marketplace.atlassian.com/apps/1221472/html-macro-for-confluence?hosting=cloud&tab=overview)


Tags: cloud

confluence-cloud
Search box is missing from top menu
Asked by Andreas Violantis:

Hi all,

We have a confluence server instance of version 7.4.17.

Suddenly the global search box from the top right area is missing. We didn't upgrade recently or apply any changes. I am suspecting that maybe a browser upgrade affected this.

Are you aware of an issue like this?

Thank you.

Regards,

Andreas Violantis


Answers:
author: Andreas Violantis
body: In the end after couple of service restarts the search box is back. Not sure what caused the issue.


Tags: confluence-server

server
Is possible to embed specific Slides (from Google Slides) or select specific slides from .pdf
Asked by Felicia Cazer:

Is possible to embed specific Slides (from Google Slides) or select specific slides from .pdf


Answers:
author: Brant Schroeder
body: [@Felicia Cazer](/t5/user/viewprofilepage/user-id/5269908) welcome to the Atlassian community

There is no way to select a specific slide or pdf. You might be able to accomplish this using an app [https://marketplace.atlassian.com/search?hosting=cloud\&product=confluence\&query=google%20slides](https://marketplace.atlassian.com/search?hosting=cloud&product=confluence&query=google%20slides)

comments: author: Felicia Cazer
body: Thanks a million!


Tags: cloud

confluence-cloud
Where do I report bugs?
Asked by Logi Helgu:

Pretty sure I've been able to do that before but for some reason I don't get the option to create a bug for Confluence/Cloud anymore :(![Untitled.png](/t5/image/serverpage/image-id/269284iF4C8D1825C13639D/image-size/large?v=v2&px=999 "Untitled.png")


Answers:
author: Vedant Kulkarni
body: [@Logi Helgu](/t5/user/viewprofilepage/user-id/5262756)

You site might be expired or you might have used free version of it. You can verify by choosing your licenses from second dropdown![supportportal1.JPG](https://community.atlassian.com/t5/image/serverpage/image-id/269291iDB112C658BC845E0/image-size/large?v=v2&px=999 "supportportal1.JPG")

comments: author: Logi Helgu
body: We have the Premium ;)


author: Logi Helgu
body: OMG...you are right [Vedant Kulkarni](https://community.atlassian.com/t5/user/viewprofilepage/user-id/1734051)...I just started typing Confluence and the automatically showd just the Confluence product selection from the right...and there is no Confluence premium, only JIRA Software lisence \>:

Maybe that option is misssing since I know we have Confluence Premium, and I can look into that...thanks \<3


author: abhishek_sharma03
body: Hi [@Logi Helgu](/t5/user/viewprofilepage/user-id/5262756) - What issue you want to report ?

BR

Abhishek

comments: author: Logi Helgu
body: I can't report an issue...just get the Explore and View options ;)


Tags: cloud

confluence-cloud
Is there a way to enable inline edit for the queryAndRender virtual function?
Asked by Jonathan Vorndamme:

The queryAndRender virtual function is very useful to show data from other forms in your view, but it would be very nice to be able to inline edit the shown values. Is there a way to achieve this?


Answers:
author: Alex Medved _ConfiForms_
body: Hi [@Jonathan Vorndamme](/t5/user/viewprofilepage/user-id/5225896)

No, this is not possible - if you want to edit records in another form then consider creating a view over that form and adding ConfiForms Edit Controls to enable edits

Alex

comments: author: Jonathan Vorndamme
body: Thanks for the quick answer. I already thought so, but wanted to make sure. What I did in the past, wsa having a list view and inside the list view combine views of the two forms I wanted to show. I have a filter working on the list view and can use the internal values of the list view to filter the data such that both forms show only related data. The problem is, in this situation (views inside other views) error messages are not shown. An alternative would be to have a filer working on different views and forms at the same time, but that's probably also impossible, right?


author: Alex Medved _ConfiForms_
body: Having nested, dynamically filtered views is an approach we suggest for complex data models that you want to edit from one UI

Alex


Tags: confiforms

confluence-server

server
Confluence too slow to edit bigger pages
Asked by Ivo Shenkenberg:

Confluence too slow to edit bigger pages. It takes sometimes 30 seconds to make new table row and to activate the cell another 15 seconds.

This is unbearable, and we not able to make online minutes of the meeting like that


Answers:
author: Rilwan Ahmed
body: Hi [@Ivo Shenkenberg](/t5/user/viewprofilepage/user-id/4877767) ,

Please try removing elements on the page or splitting up the page and see if that improves the loading speed.

Large page, too many tables usually add for performance degradation.

<https://jira.atlassian.com/browse/CONFCLOUD-70197>

comments: author: Rodrigo
body: Hello [@Ivo Shenkenberg](/t5/user/viewprofilepage/user-id/4877767)! Adding to [@Rilwan Ahmed](/t5/user/viewprofilepage/user-id/716861),

Using lots of macros also influences how long a page takes to load. Besides splitting the content, check if you have complex macros; loading multiple macros (that add extra functionality or change the way confluence works) can also affect loading times.

Best of luck! Rodrigo.


Tags: cloud

confluence-cloud
How to permanently filter a smart dropdown?
Asked by Jonathan Vorndamme:

If field definition rules to apply filter are used on smart dropdowns, this works very well for the registration. But on inline edits, the filter is gone. Is there a way to make sure the filter is also there on inline edits? Or is it just a bug?


Answers:
author: Jonathan Vorndamme
body: I don't know why I didn't see that before, but the confiforms field macro offer the option to filter selections, which also works perfectly well with inline edits.


Tags: confiforms

confluence-server

server
I am trying to set an anchor from one to another page section, not able to find Insert->Advanced opt
Asked by Saranya Manikandan:

I am trying to set an anchor from one to another page section, However I am not able to find Insert-\>Advanced option in my edit page


Answers:
author: Linh Pham_Ricksoft_Inc
body: Hi Saranya, on the Confluence cloud new editor, you can simply add the anchor link following these steps:

1. Add the respective heading tag to the section title

![Screenshot 2023-07-17 at 18.06.00.png](https://community.atlassian.com/t5/image/serverpage/image-id/269253i93432F5A9E196FA3/image-dimensions/327x423?v=v2 "Screenshot 2023-07-17 at 18.06.00.png")

2. Then, highlight the text where you want to add the anchor link, you should be able to see the option to edit the URL. Simple write #title-name from the previous step:

![Screenshot 2023-07-17 at 18.06.26.png](https://community.atlassian.com/t5/image/serverpage/image-id/269254iFC75B1EE559003D2/image-dimensions/358x210?v=v2 "Screenshot 2023-07-17 at 18.06.26.png")

I hope it works for you!


Tags: cloud

confluence-cloud
How to modify the Confluence space stylesheet
Asked by Atul Dattatray Bhujbal:

I need to remove the Created by icon available on the confluence page.


Answers:
author: Rilwan Ahmed
body: Hi [@Atul Dattatray Bhujbal](/t5/user/viewprofilepage/user-id/5045803) ,

In confluence cloud, you cannot remove the "Created By".   
There are few suggestion requests raised and you can vote and watch for the updates.

<https://jira.atlassian.com/browse/CONFCLOUD-30449>


Tags: cloud

confluence-cloud
Why are the inserted images in the Confluence page showing as 'Preview unavailable'
Asked by Prestige Park Grove:

I have been experiencing several issues with my Confluence page recently:

1. "Preview Unavailable": When viewing my published Confluence page, most of the images are appearing as "Preview Unavailable" in edit mode. These images are large, and re-inserting them would require a significant amount of work. This issue has been occurring frequently lately.
2. Hang-up and Restoration Issue: While editing the Confluence page, it often becomes unresponsive and displays a restoration issue. As a result, I am unable to publish my work. The only solution is to close the page and reopen it for further editing. Unfortunately, this causes me to lose all the previous work on the page in [Prestige Park Grove](https://www.prestigesparkgrove.in/).

I kindly request urgent attention to these issues, as we rely heavily on the Confluence page for publishing our content.

Regard,


Answers:
author: abhishek_sharma03
body: Hi [@Prestige Park Grove](/t5/user/viewprofilepage/user-id/4995947) I gather this is an existing issue with Confluence cloud and occurs intermittently. A similar issue related to cloud migrations is also tracked here - <https://jira.atlassian.com/browse/JRACLOUD-81066>

BR

Abhishek


author: Rilwan Ahmed
body: Hi [@Prestige Park Grove](/t5/user/viewprofilepage/user-id/4995947) ,

1. <https://www.prestigesparkgrove.in/> doesn't seems to be a confluence page. If at all it is a confluence page, then surely it is not Confluence cloud instance.

2. Try this workaround.

* Go to **page actions** (**...) \> Attachments \> Files
  ![image.png](https://community.atlassian.com/t5/image/serverpage/image-id/269221i71997E88A665A3E3/image-dimensions/139x72?v=v2 "image.png")**
* Click on the problematic attachment to view it
* Go back to the page and refresh


Tags: cloud

confluence-cloud
edit mode responsiveness
Asked by virginie.oknin:

after migration from confluence to confluence cloud, on existing documents with large tables and requirement yogi.

when i attempt to edit a document, it takes a lot of time for the page to respond (like few minutes just to see that it is indeed in edit mode)

then i try to add a word for example in the table. it is stuck again few minutes for each letter, making it annoying and even impossible to edit a document

not even talking on adding for example a macro , i am trying to add a req yogi, starting to write "/" to see the macros options and search for req yogi, then i am stuck for 10 minutes or more.

it is happening at the office, at home, i tried to work from incognito page and still the same behavior

i tried from a blank page, it is quite similar but more responsive. ( but i need to work on the existing pages so this is not really helping me)

please help


Answers:
author: Sayed Bares [ServiceRocket]
body: [@virginie.oknin](/t5/user/viewprofilepage/user-id/5269492) welcome to the community!

Is this issue happening to only you? or your teammates are also experiencing the same behavior?

Do you use VPN to connect to your Confluence Cloud by any chance? if so what happens if you access it without VPN? do you see improvement on the performance?

Lastly, I would like to ask if [data residency](https://support.atlassian.com/security-and-access-policies/docs/understand-data-residency/) is configured for your Confluence Cloud? if so how far is the geographical location of your Confluence from your location?


Tags: cloud

confluence-cloud
Jira Could
Asked by Sreenivasulu Kavuri:

When I create a task and assign it to a user with a mention (with @) with a certain due date (with //), the task will appear under Tasks in the assigned user's space, but Confluence does not send any notifications.

I understand that one should be able to set up reminders via the Task


Answers:
author: Valerie Knapp
body: Hi [@Sreenivasulu Kavuri](/t5/user/viewprofilepage/user-id/5262300) , thanks for your question.

I have understood you want to send reminder notifications for tasks in Confluence cloud, not Jira.

If you go to the Space where you want to send the reminders and then Automation, there is this rule already in the Automation library which you could try-

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

I hope this helps.

Cheers


Tags: cloud

confluence-cloud
Confluence page shown 'Preview unavailable' for the inserted images
Asked by Meenakshi Razdan:

For a few days, I am experiencing issues with my Confluence page.

1. "Preview Unavailable" - On my published confluence page most of the images are appearing as "Preview Unavailable" while in edit mode. Images inserted are huge and inserting again will be a huge work. This issue is happening frequently currently.

2. While editing the confluence page, suddenly my page gets hanged up showing the restoration issue and it does not allow me to publish my work. The only workaround is to close the page and re-edit. In this action, I lose all my previous work on the page.

I request you to please look into the issue urgently as we publish all our content on the Confluence page only.

Thanks.


Answers:
author: Dan Breyen
body: Hi [@Meenakshi Razdan](/t5/user/viewprofilepage/user-id/4487927) were those pages copied by any chance? There is an issue on Atlassian's Jira site (jira.atlassian.com) when copying pages. [CONFCLOUD-73527](https://jira.atlassian.com/browse/CONFCLOUD-73527) There are a few other ticket regarding similar issues you could look at as well.

I've heard of large confluence pages having issues when saving. Not sure if this is your issue or not.

You may want to create a support ticket with Atlassian (support.atlassian.com) if you are still having these issues.

Hope that helps.


Tags: cloud

confluence-cloud
Google Analytics 4 - how to capture file_downloads in Confluence?
Asked by Judy Williamson:

Does anyone have success in capturing file_downloads in Google Analytics 4 for a Confluence website?

File_downloads is activated in Enhanced Measurement. Tag instructions are added correctly (Page_views, Scrolls etc. are recorded correctly).

However, the Event File_downloads is not captured in DebugView. File_downloads is not even represented as an Event under Reports.

Any suggestion will be appreciated.


Answers:
author: David at David Simpson Apps
body: Hi Judy

If you're talking about our app [Google Analytics in Confluence](https://marketplace.atlassian.com/apps/1216936/google-analytics-in-confluence), I can help you out with answers. Also happy to do this on [our support portal](https://dsapps.atlassian.net/servicedesk/customer/portals).

The debug view will not work for file downloads because the events are sent to Google Analytics by our servers rather than from within the web browser.

We also only send attachment views/file downloads for files which are not images. The reason for this is that images are often displayed within a Confluence page, so an event would be logged for every image displayed on every page.

You can see attachment views (aka file downloads) in the [attachments report](https://help.dsapps.dev/google-analytics-in-confluence/analytics-overview#AnalyticsOverview-AttachmentsReport) in our app:

![Screenshot 2023-03-17 at 16.23.40.png](https://community.atlassian.com/t5/image/serverpage/image-id/272151iBB25BFE00B302174/image-size/large?v=v2&px=999 "Screenshot 2023-03-17 at 16.23.40.png")

Aside, the scroll event will not be useful, so we recommend that you switch that off in Google Analytics settings. The Google Analytics tracking code is loaded in an iframe , so any scrolls will be of that iframe and not for the actual page. This is because of how Atlassian allows us to build apps for cloud.

-- Cheers, David


Tags: cloud