applications/gnome-layout-switcher
3
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WIP: Draft: Prepare Consolidate resources #1

Draft
fhdk wants to merge 1 commit from prepare-resource-consolidation into master
pull from: prepare-resource-consolidation
merge into: applications:master
Conversation 1 Commits 1 Files changed 2 +6 -3
fhdk commented 2025-01-01 08:42:49 +00:00 (Migrated from gitlab2.manjaro.org)
Copy link

Consolidate resources in /usr/share/manjaro/<application>

Affects
Manjaro Hello (manjaro-hello)
Application Utility (application-utililty)
Gnome Layout Switcher (gls)

Consolidate resources in `/usr/share/manjaro/<application>` Affects Manjaro Hello (manjaro-hello) Application Utility (application-utililty) Gnome Layout Switcher (gls)
fhdk commented 2025-01-01 08:46:32 +00:00 (Migrated from gitlab2.manjaro.org)
Copy link

changed title from Draft: Consolidate resources to Draft: {+Prepare +}Consolidate resources

changed title from **Draft: Consolidate resources** to **Draft: {+Prepare +}Consolidate resources**
This pull request is broken due to missing fork information.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin prepare-resource-consolidation:prepare-resource-consolidation
git switch prepare-resource-consolidation

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master
git merge --no-ff prepare-resource-consolidation
git switch prepare-resource-consolidation
git rebase master
git switch master
git merge --ff-only prepare-resource-consolidation
git switch prepare-resource-consolidation
git rebase master
git switch master
git merge --no-ff prepare-resource-consolidation
git switch master
git merge --squash prepare-resource-consolidation
git switch master
git merge --ff-only prepare-resource-consolidation
git switch master
git merge prepare-resource-consolidation
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
applications/gnome-layout-switcher!1
No description provided.