Skip to content

Conversation

@Socialhappiness
Copy link
Contributor

No description provided.

@Socialhappiness Socialhappiness requested review from a team December 19, 2025 20:09
@jacobgkau
Copy link
Member

It looks like you've got this based on your previous branch instead of master, so since we already merged your previous PR, there are now conflicts. I can fix this for you. I assume it's okay if I just discard all changes to the Live Disk article and photos?

In the future, you can git checkout master (and git pull) before creating a new branch to avoid this.

@Socialhappiness
Copy link
Contributor Author

Thank you, I changed branches and did git pull first, sorry. I will make sure to do git checkout master and git pull before the new branch.

… 2021 and added the actual default applications and screenshots, as well as instructions for accessing and changing default apps.
@jacobgkau
Copy link
Member

jacobgkau commented Dec 19, 2025

No worries. I fixed this by doing git rebase -i master (-i stands for --interactive) and then deleting the commit from the previous PR from the list.

@jacobgkau jacobgkau self-assigned this Dec 19, 2025
jacobgkau
jacobgkau previously approved these changes Dec 19, 2025
Copy link
Member

@jacobgkau jacobgkau left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a much more useful article than what was there before (the old one really didn't need to be a support article).

I moved some of the content around to better separate the intro from the configuration section, and re-ordered the list of apps to flow from left to right in the dock.

Copy link
Contributor

@thomas-zimmerman thomas-zimmerman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is really nice update to the default applications for COSMIC. Running the site live, no odd rendering.

@leviport leviport dismissed stale reviews from thomas-zimmerman and jacobgkau via 2982765 December 22, 2025 22:02
@leviport leviport force-pushed the update-default-apps branch from 3db817f to 2982765 Compare December 22, 2025 22:02
@leviport leviport force-pushed the update-default-apps branch from 2982765 to 9038c89 Compare December 22, 2025 22:04
@leviport
Copy link
Member

Linter was mad about the very last line. There were two errors: one for a bare link and one for using ** bold ** instead of a heading. I think I fixed it.

@leviport leviport merged commit 80ec4e6 into master Dec 22, 2025
3 checks passed
@leviport leviport deleted the update-default-apps branch December 22, 2025 22:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants