From 4c536ceaa169b71c6ab0e51de21e31558fc00aeb Mon Sep 17 00:00:00 2001 From: Cleopatra <patrathewhiz@gmail.com> Date: Mon, 15 Mar 2021 03:10:30 +0000 Subject: [PATCH] Recommend Rebase, Matrix link --- content/page/building.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/page/building.md b/content/page/building.md index bd59c75..36490c1 100644 --- a/content/page/building.md +++ b/content/page/building.md @@ -54,11 +54,11 @@ Alternatively, you can also use the **Update Project** button on the toolbar:  -10\) Choose whether to "Merge incoming changes into the current branch" or to "Rebase the current branch on top of incoming changes" and click **OK** to proceed. +10\) Choose whether to "Merge incoming changes into the current branch" or to "Rebase the current branch on top of incoming changes" (Recommended) and click **OK** to proceed.  11\) Repeat steps 7 and 8 to build and install the updated app. -If you’re interested in getting involved or following the progress of the project, please [join the development mailing list](https://lists.sourceforge.net/lists/listinfo/briar-devel), [IRC channel](https://webchat.freenode.net/#briar) or [Mattermost channel](https://chat.briarproject.org/briar/channels/town-square). +If you’re interested in getting involved or following the progress of the project, please [join the development mailing list](https://lists.sourceforge.net/lists/listinfo/briar-devel), [IRC channel](https://webchat.freenode.net/#briar) or [Matrix channel](https://matrix.to/#/#freenode_#briar:matrix.org). -- GitLab