Skip to content

Commit 04e950f

Browse files
Remove EFE contributor/ports/maintaining-ports-tree.md
Co-authored-by: sourcery-ai[bot] <58596630+sourcery-ai[bot]@users.noreply.github.com>
1 parent 97ccb17 commit 04e950f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

contributor/ports/maintaining-ports-tree.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ This lists files with conflicts, marked like:
8484

8585
**Resolution Tips**:
8686
- Code conflicts require ports maintenance knowledge but are usually easy—often just changes Git can’t auto-merge.
87-
- **Keep GhostBSD changes**: Always preserve our customizations (e.g., in `Mk` files or `Makefiles`, the most common conflict sources EFE), especially fixes made before FreeBSD or changes to default options.
87+
- **Keep GhostBSD changes**: Always preserve our customizations (e.g., in `Mk` files or `Makefiles`, the most common conflict sources), especially fixes made before FreeBSD or changes to default options.
8888
- **Resolve `PORTVERSION` conflicts**: For `Makefile` `PORTVERSION`, use FreeBSD’s version (e.g., `1.2.4`) unless a comment above ours (e.g., `# Keep 1.2.3 for GhostBSD fix`) says to keep it.
8989
- **Handle directory conflicts**: If FreeBSD renamed or removed a directory, ensure all files are moved to the new location and remove the old directory (use `git status` to spot added/removed files).
9090

0 commit comments

Comments
 (0)