From 833a51eb8d0910b7249a9cc992e9aff96a7e8cf2 Mon Sep 17 00:00:00 2001 From: ericbsd Date: Fri, 18 Jul 2025 08:06:09 -0300 Subject: [PATCH] Update ports documentation to reflect renaming of FreeBSD `master` to `main` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Updated instructions for merging FreeBSD’s repository to use `main` branch instead of `master`. - Removed unnecessary explanatory text for resolving directory conflicts. --- contributor/ports/maintaining-ports-tree.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/contributor/ports/maintaining-ports-tree.md b/contributor/ports/maintaining-ports-tree.md index 7db6875..7d29d43 100644 --- a/contributor/ports/maintaining-ports-tree.md +++ b/contributor/ports/maintaining-ports-tree.md @@ -56,16 +56,13 @@ Fetch the latest changes from FreeBSD: ```shell git fetch freebsd ``` -Merge FreeBSD’s `master` branch into your branch: +Merge FreeBSD’s `main` branch into your branch: ```shell -git merge freebsd/master +git merge freebsd/main ``` - **If no conflicts occur**: Proceed to Step 5 (Testing). - **If conflicts occur**: Continue to Step 4 (Resolving Conflicts). - -You’re right—my wording for directory conflicts suggests restoring GhostBSD’s version when FreeBSD renames or removes a directory, but you want the resolver to ensure files are moved and the old directory is removed, aligning with FreeBSD’s change. Here’s the corrected section: - --- ### 4. Resolve Merge Conflicts