merge

  1. S

    In Simple Terms: How do I Merge During [freebsd-update -r]

    Hello everyone, The FreeBSD Handbook, chapter 26, concerning my question is presently still using jargon beyond my level of learning; searching the forum, the Internet, YouTube, etc. did not yield an explanation for my rather basic question. I hope I do not disturb the quality of the forums by...
  2. R

    Resolving conflicts with etcupdate

    I have been running 12/stable and noted that it won't be supported past the end of next year. This does not seem urgent, but it is getting closer. I pulled the source for 13/stable and everything went fine until I rebooted and attempted to run etcupdate -p. When I used etcupdate resolve, with...
Back
Top