[Git] fatal: refusing to merge unrelated historiesを解決ã™ã‚‹è©± - Qiita
TL;DR git merge --allow-unrelated-histories origin/masterã‚’ã™ã‚‹! ※ 2020/12/01追記 2020å¹´10月より， デフォルトブランãƒãŒmasterã‹ã‚‰mainã«å¤‰æ›´ã«ãªã‚Šã¾ã—ãŸ.(https://github.com/github/renaming) ãªã®ã§ï¼Œ æ–°ã—ã作ã£ãŸæ–¹ã¯ git merge --allow-unrelated-histories origin/mainã«ãªã‚Šã¾ã™ï¼ ãªã«ãŒèµ·ããŸã®? GitHub上ã§ãƒªãƒã‚¸ãƒˆãƒªã‚’作り， READMEを作æˆã—ãŸï¼Ž ãƒãƒ¼ã‚«ãƒ«ã§git initã—ã¦ãƒªãƒã‚¸ãƒˆãƒªã‚’作り， git remote add origin <GitHubã®ãƒªãƒã‚¸ãƒˆãƒª>ã§ãƒªãƒ¢ãƒ¼ãƒˆãƒªãƒã‚¸ãƒˆãƒªã‚’指定． ãƒãƒ¼ã‚«ãƒ«ã§ä½œæ¥ã‚’è¡Œã„，コミットã—プッシュを行ãŠã†ã¨ã—ãŸï¼Ž プッシュを行ãŠã†ã¨ã—ãŸã‚‰, 下ã®ã‚ˆã†ã«ãªã£ãŸï¼Ž To
![[Git] fatal: refusing to merge unrelated historiesを解決ã™ã‚‹è©± - Qiita](https://cdn-ak-scissors.b.st-hatena.com/image/square/27cda3e620de5aea2e5e5cfa401c772550cefdbe/height=288;version=1;width=512/https%3A%2F%2Fqiita-user-contents.imgix.net%2Fhttps%253A%252F%252Fqiita-user-contents.imgix.net%252Fhttps%25253A%25252F%25252Fcdn.qiita.com%25252Fassets%25252Fpublic%25252Farticle-ogp-background-afbab5eb44e0b055cce1258705637a91.png%253Fixlib%253Drb-4.0.0%2526w%253D1200%2526blend64%253DaHR0cHM6Ly9xaWl0YS11c2VyLXByb2ZpbGUtaW1hZ2VzLmltZ2l4Lm5ldC9odHRwcyUzQSUyRiUyRnMzLWFwLW5vcnRoZWFzdC0xLmFtYXpvbmF3cy5jb20lMkZxaWl0YS1pbWFnZS1zdG9yZSUyRjAlMkY0ODc2ODElMkY4YTE3NjY2OWYxNDI5MDgwYzU2Y2QyYjY2OTk5ZGM0ZmI3NmE2YTlhJTJGbGFyZ2UucG5nJTNGMTU4NDM0MzU4OT9peGxpYj1yYi00LjAuMCZhcj0xJTNBMSZmaXQ9Y3JvcCZtYXNrPWVsbGlwc2UmZm09cG5nMzImcz03Nzc3MmQxMGI0MzUyNDg1ODkxOWYxODRkOGE3OTcxMA%2526blend-x%253D120%2526blend-y%253D467%2526blend-w%253D82%2526blend-h%253D82%2526blend-mode%253Dnormal%2526s%253Dc951286954edb11fd3f4c29471744f35%3Fixlib%3Drb-4.0.0%26w%3D1200%26fm%3Djpg%26mark64%3DaHR0cHM6Ly9xaWl0YS11c2VyLWNvbnRlbnRzLmltZ2l4Lm5ldC9-dGV4dD9peGxpYj1yYi00LjAuMCZ3PTk2MCZoPTMyNCZ0eHQ9JTVCR2l0JTVEJTIwZmF0YWwlM0ElMjByZWZ1c2luZyUyMHRvJTIwbWVyZ2UlMjB1bnJlbGF0ZWQlMjBoaXN0b3JpZXMlRTMlODIlOTIlRTglQTclQTMlRTYlQjElQkElRTMlODElOTklRTMlODIlOEIlRTglQTklQjEmdHh0LWFsaWduPWxlZnQlMkN0b3AmdHh0LWNvbG9yPSUyMzFFMjEyMSZ0eHQtZm9udD1IaXJhZ2lubyUyMFNhbnMlMjBXNiZ0eHQtc2l6ZT01NiZ0eHQtcGFkPTAmcz04ODkzNzkwZGE5ZDViMjcxMGI1NWQ1NGFlMzAwMmQwZA%26mark-x%3D120%26mark-y%3D112%26blend64%3DaHR0cHM6Ly9xaWl0YS11c2VyLWNvbnRlbnRzLmltZ2l4Lm5ldC9-dGV4dD9peGxpYj1yYi00LjAuMCZ3PTgzOCZoPTU4JnR4dD0lNDBtZWkyOCZ0eHQtY29sb3I9JTIzMUUyMTIxJnR4dC1mb250PUhpcmFnaW5vJTIwU2FucyUyMFc2JnR4dC1zaXplPTM2JnR4dC1wYWQ9MCZzPWM1ZjNhYjY4OGM1MzdjZTdjZTk0ZjEyNGExNmMxMzI3%26blend-x%3D242%26blend-y%3D480%26blend-w%3D838%26blend-h%3D46%26blend-fit%3Dcrop%26blend-crop%3Dleft%252Cbottom%26blend-mode%3Dnormal%26s%3D8246ae7f4928de7d40a468860310d156)
`git add .` ã§fatal: CRLF would be replaced by LF in /fonts/FontAwesome.otf. ãŒã§ã‚‹å•é¡Œ - Qiita
改行コードCRLF 㨠LF WEBプãƒã‚°ãƒ©ãƒŸãƒ³ã‚°ã‚’ã—ã¦ã„ã‚‹ã¨ã€é–‹ç™ºç’°å¢ƒã§Windowsã¨Macãªã©ãŒæ··åœ¨ã—ã€æ”¹è¡Œã‚³ãƒ¼ãƒ‰ãŒã‚ã¡ã‚ƒãã¡ã‚ƒã«ãªã‚‹å ´åˆãŒã‚ã‚Šã¾ã™ã€‚ テã‚ストファイルã®æ”¹è¡Œã‚³ãƒ¼ãƒ‰ テã‚ストファイルã«ã¤ã„ã¦ã¯ã€ä¸€ã¤ä¸€ã¤ãƒ•ã‚¡ã‚¤ãƒ«ã‚’vim ã§é–‹ã„ã¦ã€:set ff=unix ã¨ã—ã¦ã‚ã’ã‚‹ã“ã¨ã§æ”¹è¡Œã‚³ãƒ¼ãƒ‰ãŒLFã«ãªã‚Šã¾ã™ã€‚ フォントファイルã®æ”¹è¡Œã‚³ãƒ¼ãƒ‰ï¼ˆï¼Ÿï¼‰ 今回ã€ãªãœã‹ãƒ•ã‚©ãƒ³ãƒˆãƒ•ã‚¡ã‚¤ãƒ«.otfã‚„.eofã«å¯¾ã—ã¦ã‚‚ warning: CRLF will be replaced by LF in 'フォントファイルã®ãƒ‘ス' ã¨ã„ã†ã‚¨ãƒ©ãƒ¼ãŒã§ã¦ã€git add .ã‚’ã™ã‚‹ã¨fatal: CRLF would be replaced by LF inã¨ã‚¨ãƒ©ãƒ¼ãŒã§ã‚‹ãŸã‚ã€addãŒã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ git addã«-fã‚’ã¤ã‘ã¦æŒ‡å®šã—ã¦ã‚‚ã€--allã—ã¦ã‚‚エラーã§è¿½åŠ ã§ãã¾ã›ã‚“。 対処ã—ãŸã‚ˆï¼ git
1
リリースã€éšœå®³æƒ…å ±ãªã©ã®ã‚µãƒ¼ãƒ“スã®ãŠçŸ¥ã‚‰ã›
最新ã®äººæ°—エントリーã®é…ä¿¡
処ç†ã‚’実行ä¸ã§ã™
j次ã®ãƒ–ックマーク
kå‰ã®ãƒ–ックマーク
lã‚ã¨ã§èªã‚€
eコメント一覧を開ã
oページを開ã
update the version in package.json without clean git working directory (without a task runner like Gulp)
ã€Git】pull or pushã®éš›ã«fatal: The remote end hung up unexpectedlyエラーãŒå‡ºãŸã¨ãã®å¯¾å‡¦ - Qiita
{{#tags}}- {{label}}
{{/tags}}