We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 882df20 commit ff2f82fCopy full SHA for ff2f82f
1 file changed
Git/upmerge.sh
@@ -20,4 +20,4 @@ git config merge.podspec-merge-driver.driver "./Submodules/SMF-iOS-CommonProject
20
git merge origin/$1/master --no-edit
21
22
git config --unset merge.ours-driver.driver
23
-git config --unset merge.podspec-merge-driver
+git config --unset merge.podspec-merge-driver.driver
0 commit comments