-
Type:
Suggestion
-
Resolution: Unresolved
-
None
-
Component/s: Git
-
None
I need to use the ours strategy i.e. merge myBranch into master, discarding any changes on myBranch
git merge -s ours myBranch
I need to use the ours strategy i.e. merge myBranch into master, discarding any changes on myBranch
git merge -s ours myBranch