From 8d3843250d028edda6f9e236d0deb125daad8489 Mon Sep 17 00:00:00 2001
From: krnv1 <41384439+krnv1@users.noreply.github.com>
Date: Thu, 11 Aug 2022 22:56:08 -0700
Subject: [PATCH] Update Git-Notes

git branching
---
 Git-Notes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Git-Notes b/Git-Notes
index 43c5156..ea5937b 100644
--- a/Git-Notes
+++ b/Git-Notes
@@ -181,7 +181,7 @@ make chnages and commit on branch
 
 git checkout master
 
-git merge feature master
+git merge feature master s
 
 git branch -d feature