Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F65949135
Resolving merge conflicts
No One
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Authored By
grahamperrin
Aug 14 2023, 6:15 PM
2023-08-14 18:15:03 (UTC+0)
Size
1 KB
Referenced Files
None
Subscribers
None
Resolving merge conflicts
View Options
% git -C /usr/doc checkout 13.2r-announc-correct
Updating files: 100% (827/827), done.
branch '13.2r-announc-correct' set up to track 'origin/13.2r-announc-correct'.
Switched to a new branch '13.2r-announc-correct'
% git -C /usr/doc pull --ff-only freebsd main
From https://git.freebsd.org/doc
* branch main -> FETCH_HEAD
hint: Diverging branches can't be fast-forwarded, you need to either:
hint:
hint: git merge --no-ff
hint:
hint: or:
hint:
hint: git rebase
hint:
hint: Disable this message with "git config advice.diverging false"
fatal: Not possible to fast-forward, aborting.
% git -C /usr/doc rebase
Current branch 13.2r-announc-correct is up to date.
% git -C /usr/doc rebase freebsd main
fatal: invalid upstream 'freebsd'
% git -C /usr/doc pull --rebase freebsd main
From https://git.freebsd.org/doc
* branch main -> FETCH_HEAD
Auto-merging website/content/en/releases/13.2R/announce.adoc
CONFLICT (content): Merge conflict in website/content/en/releases/13.2R/announce.adoc
error: could not apply 7724273da1... 13.2R/announce/: minor corrections, line breaks
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 7724273da1... 13.2R/announce/: minor corrections, line breaks
% nano /usr/doc/website/content/en/releases/13.2R/announce.adoc
%
File Metadata
Details
Attached
Mime Type
text/plain; charset=utf-8
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
6222357
Default Alt Text
Resolving merge conflicts (1 KB)
Attached To
Mode
P609 Resolving merge conflicts
Attached
Detach File
Event Timeline
Log In to Comment