From 3d5d15621b9d655e870fcbfdcc19e7497430ec10 Mon Sep 17 00:00:00 2001 From: Gonzalo Matheu Date: Fri, 19 May 2023 01:03:57 -0300 Subject: [PATCH] git-merge: update page (#10232) * git-merge: Added merge with strategy options Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com> * git-merge: -e to --edit --------- Co-authored-by: Lena <126529524+acuteenvy@users.noreply.github.com> Co-authored-by: K.B.Dharun Krishna --- pages/common/git-merge.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pages/common/git-merge.md b/pages/common/git-merge.md index fc0356d77..59f50ed40 100644 --- a/pages/common/git-merge.md +++ b/pages/common/git-merge.md @@ -9,7 +9,7 @@ - Edit the merge message: -`git merge -e {{branch_name}}` +`git merge --edit {{branch_name}}` - Merge a branch and create a merge commit: @@ -18,3 +18,7 @@ - Abort a merge in case of conflicts: `git merge --abort` + +- Merge using a specific strategy: + +`git merge --strategy {{strategy}} --strategy-option {{strategy_option}} {{branch_name}}`