Removed double examples #176

Open

maartenl wants to merge 1 commit from maartenl/user-documentation:maartenl-patch-1 into main

maartenl commented

2025-12-28 14:29:10 +00:00

Contributor

Example 2 t/m 6 were identical to example 1. Removed.

maartenl added 1 commit

2025-12-28 14:29:11 +00:00

Removed double examples 0dcc1e92d5

Example 2 t/m 6 were identical to example 1. Removed.

pboy self-assigned this

2026-05-14 08:38:12 +00:00

korora was assigned by pboy

2026-05-14 08:38:13 +00:00

pboy commented

2026-05-14 08:39:08 +00:00

Owner

We have to resolve the conflicts, specifically regarding the older PR

This pull request has changes conflicting with the target branch.

modules/ROOT/pages/services/filesharing-nfs-installation.adoc

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'Removed double examples' (!176) from maartenl/user-documentation:maartenl-patch-1 into main

Merge commit body

Reviewed-on: https://forge.fedoraproject.org/server/user-documentation/pulls/176

Merge pull request 'Removed double examples' (!176) from maartenl/user-documentation:maartenl-patch-1 into main

Reviewed-on: https://forge.fedoraproject.org/server/user-documentation/pulls/176

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u maartenl-patch-1:maartenl-maartenl-patch-1

git switch maartenl-maartenl-patch-1

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 main

git merge --no-ff maartenl-maartenl-patch-1

git switch maartenl-maartenl-patch-1

git rebase main

git switch main

git merge --ff-only maartenl-maartenl-patch-1

git switch maartenl-maartenl-patch-1

git rebase main

git switch main

git merge --no-ff maartenl-maartenl-patch-1

git switch main

git merge --squash maartenl-maartenl-patch-1