From: Ivan Grokhotkov Date: Fri, 17 Mar 2017 06:21:45 +0000 (+0800) Subject: Merge branch 'bugfix/push_master_github' into 'master' X-Git-Tag: v2.1-rc1~254 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=57486a1f618fa39771e7e1e875fd4ab59584e2c5;p=esp-idf Merge branch 'bugfix/push_master_github' into 'master' ci: Fix master branch being pushed to master Previous change in 8b6993f7 doesn't work if branch exists locally. See merge request !587 --- 57486a1f618fa39771e7e1e875fd4ab59584e2c5