From nobody Tue Aug 12 19:42:55 2025 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4c1hk76yJkz63w0Q for ; Tue, 12 Aug 2025 19:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c1hk75vWdz3VjD; Tue, 12 Aug 2025 19:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755027775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uvjTPrploPeeXgERR0n9YXVHkEAeyyBl/QalJ8T8mL8=; b=DupvV10XuEXicTZBllzW8J8+M3dxW3T+FVBYRa+KVvTWQUJvev+3OAG4uLBTeNQxwQeGam 06+zM0rEclgQvf2fhBGd+3J470Yn7bHY8XL6kmpqWwcQTeqUTKfflf9yt/3fgBYMK+273l KrKIzzUdCCyZPBFydwHp2nCLEom5xPw5zqAz0u8cInp2PhGEEsqmmVulDU//nRqpFrRr4N pOrg4IyMKY3XOY7kBTFRHse/gIfvfrqHAskUbHpWok3GYvXMoKScd41W1ease0dTViGvwy Z23QRNf6cxuy+gPJvCkWoNHeIdsaY6k0wlW9Ch4aPJHcijrBuxzEBfyeanuXaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755027775; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uvjTPrploPeeXgERR0n9YXVHkEAeyyBl/QalJ8T8mL8=; b=WW1A8wIZI2L1SZy+hx3Ugs2FUbQdhYIsdYyE0e1DVpFtKfJ8lwVqGKcnENQOx5SOg3Z/op 58o9xy7dR5PHl3Rl0h104oZD8PNc2j2t/xmCBBqruopBPdwBrL6ohqy3Tqen15IPOfdbYu uRE9SMiORZLMT4p14HKnYEEVn2HujWb+pVLrxwsEY82KFQi4gu8+3/N/gyIKZJfn2xgUFn ttP6IVNU2NgMV7QOiLXdybZboJXgCJ3J373jQT87YRKU/XRBBnsLdBKRJDapvsO/r+6rou vY1dGmj/9NkEeBBL2EgsMwcBP1y5+dgnPifY5Yt3GlWkHMMUQpozu/B9V7nY8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755027775; a=rsa-sha256; cv=none; b=nvbPxazUkIUJySwgLYghFo55EoFXF5tGy+WoK/TJ0GmqH3DlkHQemt8Cl1tJcXo24ylTae 5VrOeVB4Se1z5YKJkgN4gSlp3cZqFpRkpdvPL4TFzjCYYd0VTNL0Ad/xQn5R4G7EuH0L6k riXS0LLVYA4z4lsVQroECIkfxWdZIWxK3GWAQdQLWxVJ/mubTZ5JspxdHuoDpLjNVgkQzb 2ftFzJwzXEd4mkGgsClbkduioZCgPPhswtT7aCc/iZCRuaPG3Awu0OEZT2eJQLwMRYi9gw LR2dOKhWCpHmxUd31+AUdTT20BLbKqCpb/4FCT6TmqO32qli1fByAYWheC7ytw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c1hk75VFXzrqb; Tue, 12 Aug 2025 19:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57CJgt8s066524; Tue, 12 Aug 2025 19:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57CJgtf9066521; Tue, 12 Aug 2025 19:42:55 GMT (envelope-from git) Date: Tue, 12 Aug 2025 19:42:55 GMT Message-Id: <202508121942.57CJgtf9066521@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: d910789bdc - main - Committers guide: Fix block List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-doc-all@freebsd.org Sender: owner-dev-commits-doc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d910789bdce14cf3efcea54643aef183a93a7f86 Auto-Submitted: auto-generated The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=d910789bdce14cf3efcea54643aef183a93a7f86 commit d910789bdce14cf3efcea54643aef183a93a7f86 Author: Vladlen Popolitov AuthorDate: 2025-08-12 19:42:03 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2025-08-12 19:42:03 +0000 Committers guide: Fix block Approved by: bcr@ Differential Revision: D51843 --- documentation/content/en/articles/committers-guide/_index.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 0b23426894..71bb302151 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -833,8 +833,10 @@ To abort and get back to the state before "git rebase", run "git rebase --abort" Could not apply 646e0f9cda11... no color ls .... which looks scary. + If you bring up an editor, you will see it is a typical 3-way merge conflict resolution that you may be familiar with from other source code systems (the rest of ls.c has been omitted): [source,shell] +.... <<<<<<< HEAD #ifdef COLORLS_NEW #include @@ -844,7 +846,9 @@ If you bring up an editor, you will see it is a typical 3-way merge conflict res #include >>>>>>> 646e0f9cda11... no color ls .... + The new code is first, and your code is second. + The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then delete the old changes: [source,shell] .... @@ -853,6 +857,7 @@ The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then de #include .... save the file. + The rebase was interrupted, so you have to complete it: [source,shell] ....