commit 0b83b8f6353b650215b9bca597657608dcbe8a9d
from: Stefan Sperling <stsp@stsp.name>
via: Thomas Adam <thomas@xteddy.org>
date: Thu Jun 22 13:10:34 2023 UTC

provide a 'got merge' example in the EXAMPLES section of got.1

commit - 4434a15a4719fdf3ae54026f89dc2c9fc8692d16
commit + 0b83b8f6353b650215b9bca597657608dcbe8a9d
blob - b6da5695eaab874ad02b4ba5ad0801b9748b60fb
blob + f6ba97cb74fbc7e6a57f575c6468ef0fed2550d7
--- got/got.1
+++ got/got.1
@@ -3687,7 +3687,19 @@ from upstream:
 .Pp
 .Dl $ got update -b upstream/master
 .Dl $ got rebase master
+.Pp
+As an alternative to
+.Cm got rebase ,
+branches can be merged with
+.Cm got merge :
+.Pp
+.Dl $ got update -b master
+.Dl $ got merge upstream/master
 .Pp
+The question of whether to rebase or merge branches is philosophical.
+When in doubt, refer to the software project's policies set by project
+maintainers.
+.Pp
 As a final step, the forked repository's copy of the master branch needs
 to be kept in sync by sending the new changes there:
 .Pp