Android なプロトタイプ作って云々 (2)
現実トウヒの続き。とりあえず develop な branch から branch。
$ git checkout -b myfeature develop Switched to a new branch 'myfeature' $ git branch develop master * myfeature $
で、ソースに手を入れてみます。
管理対象
Android だと bin とか gen とかは対象外にしときたい。実はスデに add されちゃってるので管理対象から外す。
$ git rm -r --cached bin rm 'bin/Prototype-1.6.apk' rm 'bin/classes.dex' rm 'bin/com/example/proto/ProtoActivity.class' rm 'bin/com/example/proto/R$attr.class' rm 'bin/com/example/proto/R$drawable.class' rm 'bin/com/example/proto/R$layout.class' rm 'bin/com/example/proto/R$string.class' rm 'bin/com/example/proto/R.class' rm 'bin/resources.ap_' $ git rm -r --cached gen rm 'gen/com/example/proto/R.java' $
で、以下をナニ。
$ git add .classpath $ git add res/values/strings.xml $ git add .gitignore $ git commit -m 'add .gitignore and remove Files that are automatically generated' [myfeature b2b79bb] add .gitignore and remove Files that are automatically generated 13 files changed, 4 insertions(+), 25 deletions(-) create mode 100644 .gitignore delete mode 100644 bin/Prototype-1.6.apk delete mode 100644 bin/classes.dex delete mode 100644 bin/com/example/proto/ProtoActivity.class delete mode 100644 bin/com/example/proto/R$attr.class delete mode 100644 bin/com/example/proto/R$drawable.class delete mode 100644 bin/com/example/proto/R$layout.class delete mode 100644 bin/com/example/proto/R$string.class delete mode 100644 bin/com/example/proto/R.class delete mode 100644 bin/resources.ap_ delete mode 100644 gen/com/example/proto/R.java $
で、develop な branch を fetch して (pull して?) merge するのか。がしかし develop な branch を checkout しようとしたら叱られる模様。
$ git checkout develop error: Untracked working tree file 'bin/classes.dex' would be overwritten by merge. $
むむ、困った。これ、削除した事が影響してるのかなぁ。ココによると、どっかヨソに mv せい、とあるので試してみた。
$ mv bin ../. $ git checkout develop error: Untracked working tree file 'gen/com/example/proto/R.java' would be overwritten by merge. $ mv gen ../. $ git checkout develop Switched to branch 'develop' $
ls したら復活しているな。merge してみる
$ git merge myfeature Updating ebb54f7..b2b79bb Fast forward .classpath | 2 +- .gitignore | 2 ++ bin/Prototype-1.6.apk | Bin 13273 -> 0 bytes bin/classes.dex | Bin 1920 -> 0 bytes bin/com/example/proto/ProtoActivity.class | Bin 520 -> 0 bytes bin/com/example/proto/R$attr.class | Bin 340 -> 0 bytes bin/com/example/proto/R$drawable.class | Bin 400 -> 0 bytes bin/com/example/proto/R$layout.class | Bin 394 -> 0 bytes bin/com/example/proto/R$string.class | Bin 427 -> 0 bytes bin/com/example/proto/R.class | Bin 489 -> 0 bytes bin/resources.ap_ | Bin 10532 -> 0 bytes gen/com/example/proto/R.java | 23 ----------------------- res/values/strings.xml | 2 +- 13 files changed, 4 insertions(+), 25 deletions(-) create mode 100644 .gitignore delete mode 100644 bin/Prototype-1.6.apk delete mode 100644 bin/classes.dex delete mode 100644 bin/com/example/proto/ProtoActivity.class delete mode 100644 bin/com/example/proto/R$attr.class delete mode 100644 bin/com/example/proto/R$drawable.class delete mode 100644 bin/com/example/proto/R$layout.class delete mode 100644 bin/com/example/proto/R$string.class delete mode 100644 bin/com/example/proto/R.class delete mode 100644 bin/resources.ap_ delete mode 100644 gen/com/example/proto/R.java $
なんか fetch せずに merge したな。。
一応 push しておく。
$ git push origin develop Enter passphrase for key '/Users/tyamane/.ssh/id_rsa': Counting objects: 12, done. Delta compression using up to 2 threads. Compressing objects: 100% (5/5), done. Writing objects: 100% (7/7), 706 bytes, done. Total 7 (delta 3), reused 0 (delta 0) To git@github.com:yamanetoshi/xx.git ebb54f7..b2b79bb develop -> develop $
master と develop な branch がある方式は良いですね。なんか作りたくなってきた。って動機としては微妙かも。
