git svn rebase を実行すると下記のワーニングが表示される。
|
1 2 3 4 5 6 |
$ git svn rebase W: Refspec glob conflict (ref: refs/remotes/trunk): expected path: branches/trunk real path: trunk Continuing ahead with trunk Current branch master is up to date. |
.git/config の重複行(branches = 〜, tags = 〜)を削除する
|
1 2 3 4 5 6 7 8 9 10 11 12 13 14 |
[core] repositoryformatversion = 0 filemode = true bare = false logallrefupdates = true ignorecase = true precomposeunicode = false [svn-remote "svn"] url = http://192.168.0.123/svn/sample fetch = trunk:refs/remotes/trunk branches = branches/*:refs/remotes/* tags = tags/*:refs/remotes/tags/* branches = branches/*:refs/remotes/* tags = tags/*:refs/remotes/tags/* |