Date: Fri, 29 Mar 2024 15:29:32 +0000 (UTC) Message-ID: <1925193280.12169.1711726172064@aws-us-west-2-hyp-confluence-1.web.codeaurora.org> Subject: Exported From Confluence MIME-Version: 1.0 Content-Type: multipart/related; boundary="----=_Part_12168_1942085427.1711726172063" ------=_Part_12168_1942085427.1711726172063 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Content-Location: file:///C:/exported.html
A maintainer with Admin= a> access to the repository is required to fix the main repo:
git commit --amend
--signoff
and e=
nsure the appropriate Sign-off is included in the commit messagegit push --force-with-lease origin main
For everyone else (only required if you were unlucky enough to check out= the commit with the broken DCO) to fix your local repo:
git fetch origin
git branch -f main origin/main
if your local main is based=
off the upstream main
git push --force FORK main
if you ar=
e keeping your fork's main up-to-dategit checkout $BRANCH
git rebase --interactive main
Sometimes you might get DCO issues on a release branch when you're mergi= ng new commits in, fix it following a similar process:
git checkout release-22.1.x
to checkout the release branch=
at the last releasegit merge main
to merge in desired commits (use git reset =
--hard xxxx to set main at a desired commit)git rebase -i HEAD~10
to initiate a interactive rebase, re=
place 10 with the number of commits back that has DCO issuespick
' with 'edit
'git commit --a=
mend --no-edit --signoff to signoff
the commitgit rebase --continue
to continue, repeat steps 5-6 un=
til donegit push --force-with-lease origin release-=
22.1.2