Skip to content

Update ports documentation to reflect renaming of FreeBSD master to main #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ericbsd merged 1 commit into from
Jul 18, 2025
Merged

Update ports documentation to reflect renaming of FreeBSD master to main #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions contributor/ports/maintaining-ports-tree.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down