Back to being the project maintainer. Changes have been proposed by another person (or peer) via a radicle patch. To follow changes by another, we must 'track' them. ``` $ rad track did:key:z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --alias bob ✓ Tracking policy updated for z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk (bob) $ rad sync --fetch ✓ Fetching rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji from z6Mkt67…v4N1tRk.. ✓ Fetched repository from 1 seed(s) ``` Additionally, we need to add a new 'git remote' to our working copy for the peer. Upcoming versions of radicle will not require this step. ``` $ rad remote add z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk --name bob ✓ Remote bob added ✓ Remote-tracking branch bob/master created for z6Mkt67…v4N1tRk ``` ``` (stderr) $ git fetch bob From rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6Mkt67GdsW7715MEfRuP4pSZxJRJh6kj6Y48WRqVv4N1tRk * [new branch] master -> bob/master * [new branch] patches/69e881c606639691330051d7d8f013854f32fb87 -> bob/patches/69e881c606639691330051d7d8f013854f32fb87 ``` The contributor's changes are now visible to us. ``` $ git branch -r bob/master bob/patches/69e881c606639691330051d7d8f013854f32fb87 rad/master $ rad patch show 69e881c ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Define power requirements │ │ Patch 69e881c606639691330051d7d8f013854f32fb87 │ │ Author bob z6Mkt67…v4N1tRk │ │ Head 27857ec9eb04c69cacab516e8bf4b5fd36090f66 │ │ Commits ahead 2, behind 0 │ │ Status open │ │ │ │ See details. │ ├──────────────────────────────────────────────────────────────────────────────┤ │ 27857ec Add README, just for the fun │ │ 3e674d1 Define power requirements │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by bob z6Mkt67…v4N1tRk [ ... ] │ │ ↑ updated to dcf3e6dd97c95cf8653cbb8ce47df20d28eb1821 (27857ec) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ ``` Wait! There's a mistake. The REQUIREMENTS should be a markdown file. Let's quickly update the patch before incorporating the changes. Updating it this way will tell others about the corrections we needed before merging the changes. ``` $ rad patch checkout 69e881c606639691330051d7d8f013854f32fb87 ✓ Switched to branch patch/69e881c ✓ Branch patch/69e881c setup to track rad/patches/69e881c606639691330051d7d8f013854f32fb87 $ git mv REQUIREMENTS REQUIREMENTS.md $ git commit -m "Use markdown for requirements" [patch/69e881c f567f69] Use markdown for requirements 1 file changed, 0 insertions(+), 0 deletions(-) rename REQUIREMENTS => REQUIREMENTS.md (100%) ``` ``` (stderr) $ git push rad -o no-sync -o patch.message="Use markdown for requirements" ✓ Patch 69e881c updated to 70dd9a31882d184a9fe8f1f590471f5543c4d85b To rad://z42hL2jL4XNk6K8oHQaSWfMgCL7ji/z6MknSLrJoTcukLrE435hVNQT4JUhbvWLX4kUzqkEStBU8Vi * [new branch] patch/69e881c -> patches/69e881c606639691330051d7d8f013854f32fb87 ``` Great, all fixed up, lets merge the code. ``` $ git checkout master Your branch is up to date with 'rad/master'. $ git merge patch/69e881c Updating f2de534..f567f69 Fast-forward README.md | 0 REQUIREMENTS.md | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 README.md create mode 100644 REQUIREMENTS.md $ git push rad master ``` The patch is now merged and closed :). ``` $ rad patch show 69e881c ╭──────────────────────────────────────────────────────────────────────────────╮ │ Title Define power requirements │ │ Patch 69e881c606639691330051d7d8f013854f32fb87 │ │ Author bob z6Mkt67…v4N1tRk │ │ Head f567f695d25b4e8fb63b5f5ad2a584529826e908 │ │ Branches master, patch/69e881c │ │ Commits up to date │ │ Status merged │ │ │ │ See details. │ ├──────────────────────────────────────────────────────────────────────────────┤ │ f567f69 Use markdown for requirements │ │ 27857ec Add README, just for the fun │ │ 3e674d1 Define power requirements │ ├──────────────────────────────────────────────────────────────────────────────┤ │ ● opened by bob z6Mkt67…v4N1tRk [ ... ] │ │ ↑ updated to dcf3e6dd97c95cf8653cbb8ce47df20d28eb1821 (27857ec) [ ... ] │ │ ↑ updated to 70dd9a31882d184a9fe8f1f590471f5543c4d85b (f567f69) [ ... ] │ │ ✓ merged by alice (you) [ ... ] │ ╰──────────────────────────────────────────────────────────────────────────────╯ ``` To publish our new state to the network, we simply push: ``` $ git push ```