|author||Tom Hughes <firstname.lastname@example.org>||Fri Dec 03 22:33:09 2021|
|committer||Commit Bot <email@example.com>||Thu Dec 16 14:49:35 2021|
README.md: Update merge instructions The branch names have changed and we didn't have any instructions on how to push a merge commit. BUG=b:198296022 TEST=view in gitiles Change-Id: I9a35e817677807c4a40d5c37ece2a364787b47a3 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/cbor/+/3315411 Reviewed-by: Anastasiia N <firstname.lastname@example.org> Reviewed-by: Josie Nordrum <email@example.com> Tested-by: Tom Hughes <firstname.lastname@example.org> Commit-Queue: Anastasiia N <email@example.com>
This library is a partial implementation of the RFC 7049 Concise Binary Object Representation standard.
The source code was fetched from
chromium/src in order to avoid code duplication.
cros/upstream/main branch is a mirror of the
components/cbor directory from upstream. It is automatically updated to reflect the latest changes in upstream.
To pull in updates from
chromium/src, do the following:
git remote update
git checkout -b main cros/main
git merge cros/upstream/main
OWNERSshould use the version from
BUILD.gnshould mostly use the version from
main, unless the upstream changes the files to be built.
#includepaths should use the version from
main(without “components/”). This should be the majority of the merge conflicts.
git revertafter committing the merge commit. This preserves the history and makes it clear why a change is being reverted rather than quietly changing it in the merge commit.
Push the resulting merge commit with:
(chroot) $ git push HEAD:refs/for/main