Git\u306b\u3064\u3044\u3066\u3001\u3088\u304f\u4f7f\u7528\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3092\u7e8f\u3081\u305f\u306e\u3067\u5171\u6709\u3055\u305b\u3066\u9802\u304d\u307e\u3059\u3002<\/p>\n
\u500b\u4eba\u7684\u306a\u4e3b\u89b3\u304c\u591a\u5206\u306b\u3042\u308a\u3001\u7aef\u7684\u306b\u8a00\u3063\u3066\u3057\u307e\u3046\u3068\u2026<\/p>\n
Git\u306f\u3001\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3001\u305d\u308c\u3092\u6642\u7cfb\u5217\u306b\u9023\u306a\u306d\u3066\u7ba1\u7406\u3059\u308b\u4ed5\u7d44\u307f<\/p>\n
\u3067\u3059\u3002\u500b\u4eba\u7684\u306b\u306f\u3001\u30d6\u30ed\u30c3\u30af\u30c1\u30a7\u30fc\u30f3\u7684\u306a\u8981\u7d20\u3082\u6709\u308b\u69d8\u306b\u601d\u3063\u3066\u3044\u307e\u3059\u3002<\/p>\n
<\/p>\n
\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea\u3068\u30b9\u30c6\u30fc\u30b8\u3001\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306e\u69cb\u9020\u3092\u7406\u89e3\u3057\u3066\u3044\u308b\u3002<\/p>\n
<\/p>\n
\u30fb\u30b3\u30df\u30c3\u30c8\u30fb\u30fb\u30fb\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8<\/p>\n
\u30fb\u30d6\u30e9\u30f3\u30c1\u30fb\u30fb\u30fb\u4e26\u884c\u3057\u3066\u8907\u6570\u6a5f\u80fd\u3092\u958b\u767a\u3059\u308b\u70ba\u306e\u4ed5\u7d44\u307f\u3067\u3001\u30b3\u30df\u30c3\u30c8\u3092\u793a\u3059\u30dd\u30a4\u30f3\u30bf<\/p>\n
\u30fb\u30ea\u30dd\u30b8\u30c8\u30ea\u30fb\u30fb\u30fb\uff08\u4ee5\u4e0b\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u683c\u7d0d\u3055\u308c\u3066\u3044\u308b\u3082\u306e\uff09<\/p>\n
–\u00a0 \u30c4\u30ea\u30fc\u30d5\u30a1\u30a4\u30eb \u30fb\u30fb\u30fb \u30d5\u30a1\u30a4\u30eb\u306e\u4e2d\u8eab\u306e\u5727\u7e2e
\n–\u00a0 \u30b3\u30df\u30c3\u30c8\u30d5\u30a1\u30a4\u30eb \u30fb\u30fb\u30fb \u30c4\u30ea\u30fc\u3068\u7b56\u306f\u3001\u30b3\u30e1\u30f3\u30c8\u306a\u3069\u306e\u60c5\u5831
\n–\u00a0 \u30d5\u30a1\u30a4\u30eb\u540d\u306f\u3001\u30cf\u30c3\u30b7\u30e5\u306740\u6587\u5b57\u307b\u3069\u306e\u82f1\u6570\u5b57\u306b\u5727\u7e2e<\/p>\n
\u30fbHEAD\u30fb\u30fb\u30fb\u81ea\u5206\u304c\u4f5c\u696d\u3057\u3066\u3044\u308b\u30d6\u30e9\u30f3\u30c1\u3092\u793a\u3059\u30dd\u30a4\u30f3\u30bf<\/p>\n
\u30fb\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u30fb\u30fb\u30fb\u81ea\u5206\u306e\u5909\u66f4\u3057\u305f\u30b3\u30fc\u30c9\u3092\u30ea\u30dd\u30b8\u30c8\u30ea\u306b\u53d6\u308a\u8fbc\u3093\u3067\u3082\u3089\u3048\u308b\u3088\u3046\u306b\u4f9d\u983c<\/p>\n
\u30fb\u30ea\u30d9\u30fc\u30b9\u30fb\u30fb\u30fb\u30d6\u30e9\u30f3\u30c1\u306e\u57fa\u70b9\u3068\u306a\u308b\u30b3\u30df\u30c3\u30c8\u3092\u5225\u306e\u30b3\u30df\u30c3\u30c8\u306b\u79fb\u52d5<\/p>\n
<\/p>\n
\u3007\u72b6\u614b\u306e\u78ba\u8a8d<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u72b6\u614b\u306e\u78ba\u8a8d\u3084\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u30d5\u30a1\u30a4\u30eb\u306e\u78ba\u8a8d\u306b\u3082\u4f7f\u7528<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1a git status<\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git status<\/p>\n
<\/p>\n
\u3007\u30ed\u30b0\u306e\u78ba\u8a8d<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30ed\u30b0\u306e\u78ba\u8a8d<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1a git log -p -n <\u884c><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git log -p -n 1<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a J\u3068P\u30ad\u30fc\u30dc\u30fc\u30c9\u3067\u4e0a\u4e0b\u306b\u79fb\u52d5\u53ef\u80fd\u3002\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u300c–oneline \u300d\u300c–decorate\u300d\u306a\u3069\u304c\u5b58\u5728\u3059\u308b\u3002<\/p>\n
<\/p>\n
\u3007\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306e\u5909\u66f4\u306e\u53d6\u308a\u6d88\u3057<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30ed\u30b0\u306e\u78ba\u8a8d<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit checkout — <\u30d5\u30a1\u30a4\u30eb\u540d||\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d||. \u4efb\u610f\u306e\u5168\u30d5\u30a1\u30a4\u30eb\u306e\u5909\u66f4\u306e\u53d6\u308a\u6d88\u3057><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git checkout — dirname<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u300c–\u300d\u30d6\u30e9\u30f3\u30c1\u306e\u5909\u66f4\uff08\u5207\u66ff\uff09\u3082\u540c\u3058\u30b3\u30de\u30f3\u30c9\u306e\u70ba\u3001\u300c–\u300d\u3067\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4ed8\u52a0\u3057\u3066\u3044\u308b\u3002<\/p>\n
\uff1a\u00a0\u5b9f\u969b\u306f\u3001\u30b9\u30c6\u30fc\u30b8\u306e\u5185\u5bb9\u3092\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306b\u30b3\u30d4\u30fc\u3057\u3066\u3044\u308b\u3060\u3051\u3002<\/p>\n
<\/p>\n
\u3007\u30b9\u30c6\u30fc\u30b8\u306e\u5909\u66f4\u306e\u53d6\u308a\u6d88\u3057<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30ed\u30b0\u306e\u78ba\u8a8d<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit reset HEAD <\u30d5\u30a1\u30a4\u30eb\u540d||\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git reset HEAD dirname<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u5b9f\u969b\u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u5185\u5bb9\u3092\u30b9\u30c6\u30fc\u30b8\u306b\u30b3\u30d4\u30fc\u3057\u3066\u3044\u308b\u3060\u3051\u3002<\/p>\n
\uff1a\u00a0\u5bfe\u8c61\u304c\u30b9\u30c6\u30fc\u30b8\u306e\u307f\u3067\u3001\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306b\u306f\u5909\u66f4\u304c\u7121\u3044\u3068\u8a00\u3046\u70b9\u306b\u6ce8\u610f\u3002<\/p>\n
<\/p>\n
\u3007\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u3084\u308a\u76f4\u3059<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u76f4\u524d\u306e\u30b3\u30df\u30c3\u30c8\u3092\u3084\u308a\u76f4\u3059<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit commit –amend<\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git commit –amend<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u5b9f\u969b\u306f\u73fe\u5728\u306e\u30b9\u30c6\u30fc\u30b8\u306e\u5185\u5bb9\u3067\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u4fee\u6b63\uff08\u4e0a\u66f8\u304d\uff09\u3057\u3066\u3044\u308b<\/p>\n
\uff1a\u3010\u6ce8\u610f\u3011\u30ea\u30dd\u30b8\u30c8\u30ea\u306bpush \u3057\u305f\u30b3\u30df\u30c3\u30c8\u306f\u3001\u4f7f\u7528\u4e0d\u53ef
\n\uff1a\u00a0 \u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u66f8\u304d\u63db\u3048\u3066\u3057\u307e\u3046\u306e\u3067\u3001\u8907\u6570\u4eba\u3067\u4f5c\u696d\u3057\u3066\u3044\u308b\u5834\u5408\u3001A\u3055\u3093\u3068B\u3055\u3093\u3067\u5dee\u5206\u304c\u51fa\u308b\u3002<\/p>\n
<\/p>\n
\u3007\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u60c5\u5831\u78ba\u8a8d<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u60c5\u5831\u78ba\u8a8d<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit remote -v<\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git remote -v<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1aFETCH\u3068PUSH\u3067URL\u306e\u5207\u308a\u66ff\u3048\u3082\u53ef\u80fd\u306a\u70ba\u3001\u4e21\u65b9\u306eURL\u304c\u8868\u793a\u3055\u308c\u308b\u3002<\/p>\n
<\/p>\n
<\/p>\n
\u3007\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u8ffd\u52a0<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30ea\u30e2\u30fc\u30c8\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u8ffd\u52a0<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit remote add <\u30a8\u30a4\u30ea\u30a2\u30b9\u540d> <URL><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git remote add backup https:\/\/hoge.com\/sample.git<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u30d0\u30c3\u30af\u30a2\u30c3\u30d7\u4fdd\u5b58\u306a\u3069\u306b\u3088\u304f\u4f7f\u3046\u3002<\/p>\n
<\/p>\n
\u3007\u30ea\u30e2\u30fc\u30c8\u304b\u3089\u53d6\u5f97\uff08FETCH\uff09<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30ea\u30e2\u30fc\u30c8\u304b\u3089\u53d6\u5f97\u3057\u3001\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u3092\u66f4\u65b0\u3059\u308b\u3002<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit fetch <\u30ea\u30e2\u30fc\u30c8\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git fetch https:\/\/hoge.com\/sample.git<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u30ed\u30fc\u30ab\u30eb\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u307f\u66f4\u65b0\u3055\u308c\u3001\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u306f\u66f4\u65b0\uff08\u30de\u30fc\u30b8\uff09\u3055\u308c\u306a\u3044\u70b9\u306b\u6ce8\u610f\u3002<\/p>\n
<\/p>\n
\u3007\u30ea\u30e2\u30fc\u30c8\u304b\u3089\u53d6\u5f97\uff08PULL\uff09<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30d5\u30a7\u30c3\u30c1\u3057\u3066\u3001\u30de\u30fc\u30b8\u3059\u308b\u3068\u3044\u30462\u6bb5\u968e\u306e\u624b\u9806\u3092\u4e00\u5ea6\u3067\u5b9f\u65bd\u3057\u3066\u304f\u308c\u308b\u3002<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit pull <\u30ea\u30e2\u30fc\u30c8\u540d> <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git pull origin master<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u30ef\u30fc\u30af\u30c4\u30ea\u30fc\u304c\u66f4\u65b0\u3055\u308c\u308b\u3002HEAD\u304c\u3042\u308b\u30d6\u30e9\u30f3\u30c1\u306b\u3001\u30de\u30fc\u30b8\u3055\u308c\u308b\u306e\u3067\u6ce8\u610f\u3002<\/p>\n
<\/p>\n
\u3007\u30ea\u30e2\u30fc\u30c8\u540d\u306e\u3042\u308c\u3053\u308c<\/p>\n
\uff08\u78ba\u8a8d\uff09<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit remote<\/p>\n
\uff08\u5909\u66f4\uff09<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit remote remote rename <\u65e7\u30ea\u30e2\u30fc\u30c8\u540d> <\u30ea\u30e2\u30fc\u30c8\u540d><\/p>\n
\uff08\u524a\u9664\uff09<\/p>\n
\u30fbgit remote rm <\u30ea\u30e2\u30fc\u30c8\u540d><\/p>\n
<\/p>\n
\u3007\u30d6\u30e9\u30f3\u30c1\u78ba\u8a8d<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u73fe\u5728\u306e\u30d6\u30e9\u30f3\u30c1\u3092\u78ba\u8a8d\u3059\u308b\u3002<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit branch<\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git branch<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u5168\u30d6\u30e9\u30f3\u30c1\u3092\u78ba\u8a8d\u3059\u308b\u306b\u306f\u3001\u30aa\u30d7\u30b7\u30e7\u30f3\u300c-a\u300d\u3092\u4ed8\u52a0\u3002\u4f8b\uff09git branch -a<\/p>\n
<\/p>\n
\u3007\u30d6\u30e9\u30f3\u30c1\u4f5c\u6210<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30d6\u30e9\u30f3\u30c1\u3092\u65b0\u898f\u306b\u4f5c\u6210\u3057\u307e\u3059\u3002<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit branch <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git branch sample<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u30d6\u30e9\u30f3\u30c1\u306e\u5207\u308a\u66ff\u3048\u306f\u5225\u30b3\u30de\u30f3\u30c9<\/p>\n
<\/p>\n
\u3007\u30d6\u30e9\u30f3\u30c1\u5207\u308a\u66ff\u3048<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30d6\u30e9\u30f3\u30c1\u5207\u308a\u66ff\u3048<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit checkout <\u65e2\u5b58\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git checkout sample<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u4f5c\u6210\u306e\u307f\u3068\u3044\u3046\u70b9\u306b\u6ce8\u610f\u3002\u307e\u305f\u3001\u5909\u66f4\u306e\u53d6\u308a\u6d88\u3057\u306b\u3082\u300ccheckout \u300d\u3092\u4f7f\u7528\u3059\u308b\u306e\u3067\u6ce8\u610f\u3002<\/p>\n
<\/p>\n
\u3007\u30d6\u30e9\u30f3\u30c1\u4f5c\u6210\u3068\u5207\u66ff\u3048<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30d6\u30e9\u30f3\u30c1\u4f5c\u6210\u3068\u5207\u308a\u66ff\u3048\u3092\u540c\u6642\u306b\u5b9f\u65bd<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit checkout -b <\u65b0\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git checkout -b newblanch<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u4f5c\u6210\u306e\u307f\u3068\u3044\u3046\u70b9\u306b\u6ce8\u610f<\/p>\n
<\/p>\n
\u3007\u30d6\u30e9\u30f3\u30c1\u306e\u30de\u30fc\u30b8<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30d6\u30e9\u30f3\u30c1\u30de\u30fc\u30b8<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit merge <\u30d6\u30e9\u30f3\u30c1\u540d || \u30ea\u30e2\u30fc\u30c8\u540d\/\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git merge origin\/master<\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1amaster \u306b future \u3092\u30de\u30fc\u30b8\u3059\u308b\u5834\u5408\u3001HEAD\u306fmaster \u3067\u3001\u300cgit merge future\u300d\u3092\u5b9f\u65bd<\/p>\n
<\/p>\n
\u203b\u3061\u306a\u307f\u306b\u3001\u30de\u30fc\u30b8\u306b\u306f\u4ee5\u4e0b\u306e3\u7a2e\u985e\u3042\u308b<\/p>\n
1\uff0eFast Foward \uff1a\u65e9\u9001\u308a\u306b\u306a\u308b\u30de\u30fc\u30b8\u30fb\u30fb\u30fb\u30d6\u30e9\u30f3\u30c1\u306e\u30dd\u30a4\u30f3\u30c8\u3092\u524d\u306b\u9032\u3081\u307e\u3059\u3002<\/p>\n
2\uff0eAutoMerge \uff1a \u57fa\u672c\u7684\u306a\u30de\u30fc\u30b8\u30fb\u30fb\u30fb\u679d\u5206\u304b\u308c\u3057\u3066\u958b\u767a\u3092\u3057\u305f\u5834\u5408\u3001\u30de\u30fc\u30b8\u30b3\u30df\u30c3\u30c8\u3068\u8a00\u3046\u65b0\u3057\u3044\u30b3\u30df\u30c3\u30c8\u3092\u4f5c\u6210\u3057\u307e\u3059\u3002<\/p>\n
3\uff0e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\uff1a\u3044\u308f\u3086\u308b\u7af6\u5408\u30fb\u30fb\u30fb\u3053\u308c\u306f\u5f8c\u8ff0\u3057\u307e\u3059\u3002<\/p>\n
<\/p>\n
\u3007\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6c7a<\/p>\n
\u3061\u3087\u3063\u3068\u8131\u7dda\u3057\u307e\u3059\u304c\u3001\u30de\u30fc\u30b8\u6642\u306e\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306b\u3064\u3044\u3066\u3001\u3053\u308c\u306e\u89e3\u6c7a\u306b\u3064\u3044\u3066\u8a18\u8ff0\u3057\u307e\u3059\u3002<\/p>\n
<\/p>\n
\uff08\u5909\u66f4\u524d\uff09
\n<<<<<<<<<<<<< HEAD
\n\u4fee\u6b63\u5185\u5bb9A
\n=============
\n\u4fee\u6b63\u5185\u5bb9B
\n<<<<<<<<<<<<< \u30de\u30fc\u30b8\u5bfe\u8c61\u30d6\u30e9\u30f3\u30c1\u540d<\/p><\/blockquote>\n<\/p>\n
\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3059\u308b\u3068\u3001\u30d5\u30a1\u30a4\u30eb\u304c\u4e0a\u306e\u69d8\u306a\u5185\u5bb9\u306b\u306a\u308b\u3002<\/p>\n
<\/p>\n
\uff08\u5909\u66f4\u5f8c\uff09
\n\u4fee\u6b63\u5185\u5bb9A<\/p><\/blockquote>\n<\/p>\n
\u89e3\u6c7a\u306b\u306f\u3001\u4e0a\u8a18\u306e\u69d8\u306b\u66f8\u304d\u63db\u3048\u3001\u305d\u306e\u5f8c\u3001\u4fee\u6b63\u3092\u4fdd\u5b58\u3057\u3001\u30b3\u30df\u30c3\u30c8\u3067\u89e3\u6c7a\u3068\u306a\u308a\u307e\u3059\u3002<\/p>\n
<\/p>\n
\u203b\u305d\u3082\u305d\u3082\u3001\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u304c\u8d77\u304d\u306a\u3044\u3088\u3046\u306b\u3059\u308b\u306b\u306f\uff1f
\n\u30d7\u30eb \u3084\u30de\u30fc\u30b8\u3092\u3059\u308b\u969b\u3001\u5909\u66f4\u4e2d\u306e\u30d5\u30a1\u30a4\u30eb\u304c\u3042\u308b\u72b6\u614b\u3092\u907f\u3051\u308b\u3002\u5177\u4f53\u7684\u306b\u306f\u3001commit \u3084 stash \u3092\u3057\u3066\u304a\u304f\u306e\u304c\u826f\u3044\u3002<\/p>\n<\/p>\n
\u3007\u30d6\u30e9\u30f3\u30c1\u540d\u306e\u5909\u66f4<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30d6\u30e9\u30f3\u30c1\u540d\u306e\u5909\u66f4<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit branch -m <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git branch -m nextbranchname<\/p>\n
<\/p>\n
\u3007\u30d6\u30e9\u30f3\u30c1\u540d\u306e\u524a\u9664<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30d6\u30e9\u30f3\u30c1\u540d\u306e\u524a\u9664<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit branch -d <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git branch -d oldbranchname<\/p>\n
<\/p>\n
\u3007\u30d6\u30e9\u30f3\u30c1\u540d\u306e\u5f37\u5236\u524a\u9664<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30d6\u30e9\u30f3\u30c1\u540d\u306e\u5f37\u5236\u524a\u9664<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit branch -D <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git branch -D oldbranchname<\/p>\n
<\/p>\n
\u203b\u30ea\u30e2\u30fc\u30c8\u30d6\u30e9\u30f3\u30c1\u306b\u3064\u3044\u3066<\/p>\n
\u30d6\u30e9\u30f3\u30c1\u3092\u78ba\u8a8d\u3057\u305f\u969b\u306b\u3001\u4ee5\u4e0b\u306e\u69d8\u306b\u306a\u3063\u3066\u3044\u305f\u5834\u5408<\/p>\n
\n*master
\nremotes\/origin\/master
\nremotes\/origin\/newbranch<\/p>\n<\/blockquote>\n\u4e0a\u8a18\u306e\u72b6\u614b\u3067\u3001master \u306b\u3000remotes\/origin\/master\u3092\u30de\u30fc\u30b8\u3059\u308b\u969b\u306f\u3001\u300cremotes\u300d\u3092\u8a18\u8f09\u3057\u306a\u304f\u3066OK<\/p>\n
\u3007\u30ea\u30d9\u30fc\u30b9<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u30d6\u30e9\u30f3\u30c1\u306e\u57fa\u70b9\u3068\u306a\u308b\u30b3\u30df\u30c3\u30c8\u3092\u5225\u306e\u30b3\u30df\u30c3\u30c8\u306b\u79fb\u52d5\u3059\u308b\u3002<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit rebase <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git rebase <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u30de\u30fc\u30b8\u3068\u306e\u9055\u3044\u306f\u3001\u5206\u5c90\u306e\u6709\u7121<\/p>\n
\u30fb\u30ea\u30d9\u30fc\u30b9\u306e\u4e00\u9023\u306e\u4f5c\u696d\u306e\u6d41\u308c<\/p>\n
master \u3068 A\u30d6\u30e9\u30f3\u30c1\u304c\u3042\u3063\u305f\u5834\u5408\u3001A\u30d6\u30e9\u30f3\u30c1\u3067\u3001\u4ee5\u4e0b\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c
\ngit checkout A
\ngit rebase master<\/p>\n\u6b21\u306b\u3001master \u3067\u4ee5\u4e0b\u30b3\u30de\u30f3\u30c9\u3092\u5b9f\u884c\u3059\u308b\u3053\u3068\u306b\u3088\u308a\u3001master \u306e\u30b3\u30df\u30c3\u30c8\u3092Fast Fowerd\u3067\u304d\u308b<\/p>\n
\u3000git checkout maste
\ngit merge A<\/p>\n\u203b\u30ea\u30d9\u30fc\u30b9\u3067\u3057\u3066\u306f\u3044\u3051\u306a\u3044\u3053\u3068<\/p>\n
\u30fb\u30ea\u30e2\u30fc\u30c8\u306b\u30d7\u30c3\u30b7\u30e5\u3057\u305f\u30b3\u30df\u30c3\u30c8\u3092\u30ea\u30d9\u30fc\u30b9\u3059\u308b\u306e\u306fNG<\/p>\n
–\u00a0 \u5c65\u6b74\u304c\u98df\u3044\u9055\u3044\u3001\u30d7\u30c3\u30b7\u30e5\u3067\u304d\u306a\u304f\u306a\u308b\u3002<\/p>\n
\u30fb\u300cgit push -f\u300d\uff08\u30d5\u30a9\u30fc\u30b9\u30b3\u30df\u30c3\u30c8\uff09\u306f\u7d76\u5bfeNG<\/p>\n
–\u00a0 \u5f37\u5236\u30b3\u30df\u30c3\u30c8\u306f\u3001\u5b8c\u5168\u306b\u5c65\u6b74\u304c\u58ca\u308c\u308b\u306e\u3067\u4f7f\u308f\u306a\u3044\u4e8b<\/p>\n
\u30fb\u3058\u3083\u3001\u30de\u30fc\u30b8\u304b\u30ea\u30d9\u30fc\u30b9\u304b\u3001\u3069\u3063\u3061\u3092\u4f7f\u3046\uff1f<\/p>\n
–\u00a0 \u904b\u7528\u6b21\u7b2c\u3060\u304c\u2026<\/p>\n
\u30fb\u30de\u30fc\u30b8\u306e\u30e1\u30ea\u30c3\u30c8<\/p>\n
– \u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6c7a\u304c\u6bd4\u8f03\u7684\u7c21\u5358<\/p>\n
\u30fb\u30de\u30fc\u30b8\u306e\u30c7\u30e1\u30ea\u30c3\u30c8<\/p>\n
\u5c65\u6b74\u304c\u7169\u96d1\u5316<\/p>\n
\u30fb\u30ea\u30d9\u30fc\u30b9\u306e\u30e1\u30ea\u30c3\u30c8<\/p>\n
\u5c65\u6b74\u304c\u7dba\u9e97<\/p>\n
\u30fb\u30ea\u30d9\u30fc\u30b9\u306e\u30c7\u30e1\u30ea\u30c3\u30c8<\/p>\n
\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u306e\u89e3\u6c7a\u304c\u9762\u5012<\/p>\n
<\/p>\n
\u30fb\u500b\u4eba\u7684\u306b\u306f\u2026<\/p>\n
\u203b\u30de\u30fc\u30b8\u306f\u3001\u4f5c\u696d\u306e\u5c65\u6b74\u3092\u6b8b\u3057\u305f\u3044\u5834\u5408\u3001\u4f7f\u7528<\/p>\n
\u203b\u30d7\u30c3\u30b7\u30e5\u3057\u305f\u5f8c\u306f\u3001\u30de\u30fc\u30b8\u3092\u4f7f\u7528<\/p>\n
\u203b\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305d\u3046\u306a\u5834\u5408\u306f\u3001\u30de\u30fc\u30b8\u3092\u4f7f\u7528<\/p>\n
\u30b3\u30f3\u30d5\u30ea\u306e\u6709\u7121\u306f\u3001\u30d7\u30eb\u30ea\u30af\u3059\u308b\u3068\u5206\u304b\u308b\u3002<\/p>\n
\u203b\u5c65\u6b74\u3092\u7dba\u9e97\u306b\u3057\u305f\u3044\u3002\u6b8b\u3055\u306a\u304f\u3066\u3082\u826f\u3044\u5834\u5408\u3001\u4f7f\u7528<\/p>\n
\u203b\u30d7\u30c3\u30b7\u30e5\u3057\u3066\u3044\u306a\u3044\u30ed\u30fc\u30ab\u30eb\u306e\u5909\u66f4\u306b\u306f\u30ea\u30d9\u30fc\u30b9<\/p>\n
<\/p>\n
\u3007\u30d7\u30eb<\/p>\n
\u30fb\u30d7\u30eb\u306b\u306f\u4ee5\u4e0b\u306e2\u7a2e\u985e\u304c\u3042\u308b<\/p>\n
\uff11\uff0e\u30de\u30fc\u30b8\u578b<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u6319\u52d5\u3068\u3057\u3066\u306f\u3001\u300cgit fetch\u300d\u300cgit marge\u300d\u306e\u5b9f\u65bd<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit pull <\u30ea\u30e2\u30fc\u30c8\u540d> <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git pull <\u30ea\u30e2\u30fc\u30c8\u540d> <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u5c65\u6b74\u304c\u6b8b\u308b<\/p>\n
<\/p>\n
\uff12\uff0e\u30ea\u30d9\u30fc\u30b9\u578b<\/p>\n
\u30fb\u7528\u9014\u3000\u3000\uff1a\u6319\u52d5\u3068\u3057\u3066\u306f\u3001\u300cgit fetch\u300d\u300cgit rebase\u300d\u306e\u5b9f\u65bd<\/p>\n
\u30fb\u30b3\u30de\u30f3\u30c9 \uff1agit pull –rebase <\u30ea\u30e2\u30fc\u30c8\u540d> <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u4f7f\u7528\u4f8b \u3000\uff1a git pull –rebase <\u30ea\u30e2\u30fc\u30c8\u540d> <\u30d6\u30e9\u30f3\u30c1\u540d><\/p>\n
\u30fb\u7279\u8a18 \u3000\u3000\uff1a\u5c65\u6b74\u304c\u6b8b\u3089\u306a\u3044\u3002\u5358\u7d14\u306b\u30c7\u30fc\u30bf\u3092\u53d6\u5f97\u3057\u305f\u3044\u5834\u5408\u306a\u3069\u306b\u4f7f\u7528<\/p>\n
<\/p>\n
<\/p>\n
<\/p>\n
\u6700\u5f8c\u306b<\/h3>\n
\u4eca\u3084\u3001\u5f53\u305f\u308a\u524d\u306b\u306a\u3063\u3066\u3044\u307e\u3059\u304c\u3001\u500b\u4eba\u7684\u306b\u826f\u3044\u306a\u3002\u3068\u601d\u3046\u904b\u7528\u306f\u4ee5\u4e0b\u3067\u3059\u3002<\/p>\n
\u30fbmaster \u306f\u30ea\u30ea\u30fc\u30b9\u7528\u306b\u3057\u3066\u3057\u307e\u3046\u3002<\/p>\n
\u30fb\u958b\u767a\u306f\u3001\u6a5f\u80fd\u6bce\u306a\u3069\u5404\u30c8\u30d4\u30c3\u30af\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3066\u9032\u3081\u308b\u3002<\/p>\n
\u3064\u307e\u308a\u3001\u4ee5\u4e0b\u306e\u69d8\u306a\u904b\u7528\u30d5\u30ed\u30fc\u3092\u4f5c\u308b\u3002<\/p>\n
\n
- master \u30d6\u30e9\u30f3\u30c1\u306f\u5e38\u306b\u30c7\u30d7\u30ed\u30a4\u3067\u304d\u308b\u72b6\u614b\u306b\u4fdd\u3064\u3002<\/li>\n
- \u65b0\u958b\u767a\u306f\u3001master \u30d6\u30e9\u30f3\u30c1\u304b\u3089\u65b0\u3057\u3044\u30d6\u30e9\u30f3\u30c1\u3092\u4f5c\u6210\u3057\u3066\u30b9\u30bf\u30fc\u30c8\u3059\u308b\u3002<\/li>\n
- \u4f5c\u6210\u3057\u305f\u65b0\u3057\u3044 \u30d6\u30e9\u30f3\u30c1\u4e0a\u3067\u4f5c\u696d\u3057\u3001\u30b3\u30df\u30c3\u30c8\u3092\u5b9f\u65bd\u3057\u3001\u5b9a\u671f\u7684\u306bPush\u3059\u308b\u3002<\/li>\n
- \u30d6\u30e9\u30f3\u30c1\u306f\u3001master \u306b\u30de\u30fc\u30b8\u3059\u308b\u70ba\u3001\u30d7\u30eb\u30ea\u30af\u30a8\u30b9\u30c8\u3092\u90fd\u5ea6\u3001\u5b9f\u65bd\u3059\u308b\u3002
\n–\u00a0 \u3053\u308c\u306b\u3088\u308a\u5fc5\u305a\u30ec\u30d3\u30e5\u30fc\u3092\u53d7\u3051\u308b\u3053\u3068\u306b\u306a\u308b\u3002<\/li>\n- master \u30d6\u30e9\u30f3\u30c1\u306b\u30de\u30fc\u30b8\u3057\u305f\u3089\u5373\u30c7\u30d7\u30ed\u30a4\u3059\u308b\u3002
\n–\u00a0 \u30c6\u30b9\u30c8\u3068\u30c7\u30d7\u30ed\u30a4\u4f5c\u696d\u306f\u53ef\u80fd\u306a\u3089\u3070\u81ea\u52d5\u5316\u3059\u308b\u3002<\/li>\n<\/ol>\n<\/p>\n
Git\u306f\u3001\u3068\u3066\u3082\u4fbf\u5229\u3067\u3001\u4f7f\u7528\u3057\u3066\u3044\u308b\u4eba\u304c\u591a\u3044\u3068\u601d\u3044\u307e\u3059\u306e\u3067\u3001\u3053\u306e\u30b3\u30de\u30f3\u30c9\u4e00\u89a7\u304c\u3001\u4e00\u52a9\u306b\u306a\u308c\u3070\u3068\u601d\u3044\u307e\u3059\u3002<\/p>\n
\u3067\u308f<\/p>\n
<\/p>\n","protected":false},"excerpt":{"rendered":"
Git\u306b\u3064\u3044\u3066\u3001\u3088\u304f\u4f7f\u7528\u3059\u308b\u30b3\u30de\u30f3\u30c9\u3092\u7e8f\u3081\u305f\u306e\u3067\u5171\u6709\u3055\u305b\u3066\u9802\u304d\u307e\u3059\u3002 \u305d\u3082\u305d\u3082Git\u3063\u3066\uff1f \u500b\u4eba\u7684\u306a\u4e3b\u89b3\u304c\u591a\u5206\u306b\u3042\u308a\u3001\u7aef\u7684\u306b\u8a00\u3063\u3066\u3057\u307e\u3046\u3068\u2026 Git\u306f\u3001\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u3001\u305d\u308c\u3092\u6642\u7cfb\u5217\u306b\u9023\u306a\u306d\u3066\u7ba1\u7406\u3059\u308b\u4ed5\u7d44\u307f \u3067\u3059\u3002\u500b\u4eba\u7684…<\/p>\n","protected":false},"author":5,"featured_media":5159,"comment_status":"closed","ping_status":"open","sticky":false,"template":"","format":"standard","meta":[],"categories":[16,18,23],"tags":[220,221],"_links":{"self":[{"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/posts\/5150"}],"collection":[{"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/users\/5"}],"replies":[{"embeddable":true,"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/comments?post=5150"}],"version-history":[{"count":6,"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/posts\/5150\/revisions"}],"predecessor-version":[{"id":5157,"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/posts\/5150\/revisions\/5157"}],"wp:featuredmedia":[{"embeddable":true,"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/media\/5159"}],"wp:attachment":[{"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/media?parent=5150"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/categories?post=5150"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.sria.co.jp\/blog\/wp-json\/wp\/v2\/tags?post=5150"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}