Set merge strategy for divergent branches

Fix #125.
gcapes · Mar 15, 2024 · 25e07ef · 25e07ef
1 parent 06246fa
commit 25e07ef
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/_episodes/02-local.md b/_episodes/02-local.md
@@ -84,6 +84,15 @@ $ git config --global core.editor nano
 {: .language-bash}
 
 
+## Set remote merge strategy
+
+Set the default behaviour for merging remote branches (this afternoon).
+
+~~~
+git config --global pull.rebase false
+~~~
+{: .language-bash}
+
 ## Git's global configuration
 
 We can now preview (and edit, if necessary) Git's global configuration (such as