From 0ce541a8071fcd88b6399d1c0e879f7c30287c85 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Thu, 21 Mar 2024 20:24:05 +0100 Subject: [PATCH] Make some edits to the user guide --- _guides/user.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/_guides/user.md b/_guides/user.md index 9bc0828..8618570 100644 --- a/_guides/user.md +++ b/_guides/user.md @@ -960,7 +960,7 @@ where he enters `rad inbox`. ╰────────────────────────────────────────────────────────────────────────────────────────────╯ -The Radicle inbox is like notifications center, displaying issues and patches +The Radicle inbox is like a notifications center, displaying issues and patches that are newly created or have unread comments or new activity. > 👾 @@ -1046,8 +1046,8 @@ making the changes in a new branch, and once we're done, we'll open a patch. Let's dive into it step-by-step. First, we need to make sure we're in our working copy of the `dark-star` -repository. We can check using the `rad .` invocation that the current -repository's RID matches that of `dark-star`. +repository. You can always check the current Radicle repository using the `rad +.` invocation. $ rad . rad:z3cyotNHuasWowQ2h4yF9c3tFFdvc @@ -1460,6 +1460,13 @@ and then we'll initiate a regular `pull`: Fast-forward ... +> 🧠 +> +> The `git pull` command is really just a `git fetch` followed by a `git +> merge`. If you're comfortable with Git, it can be a good idea to first run +> the `fetch`, see which remote-tracking branches were updated, and decide what +> to merge yourself. + There we go, our working copy is now up to date with Calyx's. If you get `Already up to date.`, it could mean that the changes pushed by