From f236bd6a818e7f55efc3431e2030f7e141bcea3a Mon Sep 17 00:00:00 2001 From: Matěj Cepl Date: Thu, 20 Jul 2023 11:42:43 +0200 Subject: Just use factory/ branch, if it already exists. --- git-obranch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-obranch b/git-obranch index fb5e90d..f49ce79 100755 --- a/git-obranch +++ b/git-obranch @@ -66,7 +66,7 @@ echo '_scmsync.obsinfo' >> .git/info/exclude # Set config git config "lfs.$(git remote get-url myproj)/info/lfs.locksverify" true # Switch to factory branch, obs_state is just a record of the old state -git checkout --force -b factory myproj/factory +git checkout --force -B factory myproj/factory # # SCM Sync settings OSC_META=$(mktemp /tmp/osc_meta_data.XXXXXX.xml) -- cgit