我在各种git flow相关网站上看到了多个矛盾的定义.是否有官方推荐或单一事实来源？
分支机构:release-1.2.3或release-v1.2.3
标签:1.2.3或v1.2.3
我使用git作为Subversion的前端(通过git svn).
因此,对于每个svn trunk/branch,我在git中有一个名为"remotes/xxx"的远程分支.例如"遥控器/主干","遥控器/冷藏特征".
现在我希望每个远程分支都有一个"默认"本地分支,用于dcommit.问题是我希望这些分支以Subversion分支命名,比如"trunk","coolfeature",所以我在git中有以下分支:
trunk
coolfeature
remotes/trunk
remotes/coolfeature
问题是,每当我引用"trunk"或"coolfeature"时,git抱怨分支名称含糊不清.没什么大不了的,但我觉得不舒服.
问题是,我怎么能处理这个警告,假设简单地重命名分支不是我想要做的.这类案件的最佳做法是什么？
我收到以下歧义警告并且无法切换分支，请帮助我解决此问题
maradhak@WW720L102019A /c/myProj (mylocalbranch1)
$ git checkout -b mylocalbranch2 origin/sprint_20_master
warning: refname 'origin/sprint_20_master' is ambiguous.
Checking out files: 100% (535/535), done.
warning: refname 'origin/sprint_20_master' is ambiguous.
fatal: Ambiguous object name: 'origin/sprint_20_master'.
===>$ gitbranch -a，请找到下面的输出
master
* mylocalbranch1
origin/sprint_20_master
sampleapp
remotes/origin/HEAD -> origin/master
remotes/origin/master
remotes/origin/sampleapp
remotes/origin/sprint20_jothi
remotes/origin/sprint20mani
remotes/origin/sprint_20_master
maradhak@WW720L102019A /c/myProj (mylocalbranch1)
===>$ git ls-remote 。请找到下面的输出
37aaf00bf238cc520307bfc51c2148f95908e086 HEAD
e42e61debb97f8dad54e3f825d9dd2fe44afef52 refs/heads/master
37aaf00bf238cc520307bfc51c2148f95908e086 refs/heads/mylocalbranch1
f346e6260f4c0166883e7dfba927f069d74a2c31 refs/heads/origin/sprint_20_master
f346e6260f4c0166883e7dfba927f069d74a2c31 refs/heads/sampleapp
e42e61debb97f8dad54e3f825d9dd2fe44afef52 refs/remotes/origin/HEAD
e42e61debb97f8dad54e3f825d9dd2fe44afef52 refs/remotes/origin/master
f346e6260f4c0166883e7dfba927f069d74a2c31 refs/remotes/origin/sampleapp
fb4faac845d7955b99e5345bad2c86c2f7187810 refs/remotes/origin/sprint20_jothi
37aaf00bf238cc520307bfc51c2148f95908e086 refs/remotes/origin/sprint20mani
36a77aeeef61ce744455f2406427d2e2ceb774ba refs/remotes/origin/sprint_20_master
maradhak@WW720L102019A /c/myProj (mylocalbranch1)
===>$ …