搜尋倉儲分支中的 字串 - 2015fallhw/2015fallcadpa GitHub Wiki

git clone 倉儲

git checkout gh-pages

以最新在前的順序, 列出搜尋到的所有資料

git grep "<<<<<<<" $(git rev-list --all)

得到以下結果:

ce6184f6d2ce838a9302cf6bbd81f83c95f75c9e:reveal.leo:<<<<<<< HEAD fc02469445ca6d5f86a88b0f1bba4aba2e049b2a:reveal.leo:<<<<<<< HEAD 87eb4c874587b33dca76ad737ec528c651a846c1:reveal.leo:<<<<<<< HEAD 87eb4c874587b33dca76ad737ec528c651a846c1:reveal.leo:<<<<<<< HEAD 87eb4c874587b33dca76ad737ec528c651a846c1:reveal.leo:<<<<<<< HEAD 87eb4c874587b33dca76ad737ec528c651a846c1:reveal.leo:<<<<<<< HEAD 87eb4c874587b33dca76ad737ec528c651a846c1:reveal.leo:<<<<<<< HEAD aadac8e93e13ad873c732bf8f7641ae3a6c848d4:reveal.leo:<<<<<<< HEAD aadac8e93e13ad873c732bf8f7641ae3a6c848d4:reveal.leo:<<<<<<< HEAD aadac8e93e13ad873c732bf8f7641ae3a6c848d4:reveal.leo:<<<<<<< HEAD aadac8e93e13ad873c732bf8f7641ae3a6c848d4:reveal.leo:<<<<<<< HEAD 13349d842d2f1794dc57f91cb4e061ed7a9fbc2e:reveal.leo:<<<<<<< HEAD 13349d842d2f1794dc57f91cb4e061ed7a9fbc2e:reveal.leo:<<<<<<< HEAD 13349d842d2f1794dc57f91cb4e061ed7a9fbc2e:reveal.leo:<<<<<<< HEAD 7412c685297833397454345571c5f72ff458b085:reveal.leo:<<<<<<< HEAD 7412c685297833397454345571c5f72ff458b085:reveal.leo:<<<<<<< HEAD fbdfcb0c96828b437cdbc07b10c7e1acc5ff4535:reveal.leo:<<<<<<< HEAD fbdfcb0c96828b437cdbc07b10c7e1acc5ff4535:reveal.leo:<<<<<<< HEAD 78f61374a2e5bbf416366c42d2ac5a85f45ce978:reveal.leo:<<<<<<< HEAD 3526118ebb09143e4128b1a6559678072942f09e:reveal.leo~:<<<<<<< HEAD 3526118ebb09143e4128b1a6559678072942f09e:reveal.leo~:<<<<<<< HEAD 3526118ebb09143e4128b1a6559678072942f09e:reveal.leo~:<<<<<<< HEAD 3526118ebb09143e4128b1a6559678072942f09e:reveal.leo~:<<<<<<< HEAD 3540b912e0e6de46f14b02799f765a7351fba9c6:reveal.leo:<<<<<<< HEAD 3540b912e0e6de46f14b02799f765a7351fba9c6:reveal.leo:<<<<<<< HEAD ae0cfea2db5be80cc64e7ab4e87eada274e743fd:reveal.leo:<<<<<<< HEAD ae0cfea2db5be80cc64e7ab4e87eada274e743fd:reveal.leo:<<<<<<< HEAD 89f6678af8a0cd654760cf637899bd90314f24d2:reveal.leo:<<<<<<< HEAD 89f6678af8a0cd654760cf637899bd90314f24d2:reveal.leo:<<<<<<< HEAD 89f6678af8a0cd654760cf637899bd90314f24d2:reveal.leo:<<<<<<< HEAD 89f6678af8a0cd654760cf637899bd90314f24d2:reveal.leo:<<<<<<< HEAD fbe466a14988525555f1b61f0c0d95e940ac9bd5:reveal.leo:<<<<<<< HEAD fbe466a14988525555f1b61f0c0d95e940ac9bd5:reveal.leo:<<<<<<< HEAD 52527ecad1518f48a0fc0fbc83b007ccf1294faf:reveal.leo:<<<<<<< HEAD 52527ecad1518f48a0fc0fbc83b007ccf1294faf:reveal.leo:<<<<<<< HEAD 6aec81d262cb817247b3a720b2f4201990c54bcd:reveal.leo:<<<<<<< HEAD 9b7761c304ba53ae6b93281e75e34f26fab55a28:reveal.leo:<<<<<<< HEAD

表示在所有推送資料中, 第一個產生衝突而沒有解決就推向倉儲的提交為 (40323116):

https://github.com/2015fallhw/2015fallcadpa/commit/9b7761c304ba53ae6b93281e75e34f26fab55a28

第二個有問題的提交為 (40323135):

https://github.com/2015fallhw/2015fallcadpa/commit/6aec81d262cb817247b3a720b2f4201990c54bcd

第3個有問題的提交為 (40323135):

https://github.com/2015fallhw/2015fallcadpa/commit/52527ecad1518f48a0fc0fbc83b007ccf1294faf

依此類推, 可以清楚找到發生問題的源頭!