Guestbook
Notice
Recent Posts
Recent Comments
Link
| 일 | 월 | 화 | 수 | 목 | 금 | 토 |
|---|---|---|---|---|---|---|
| 1 | 2 | 3 | 4 | 5 | ||
| 6 | 7 | 8 | 9 | 10 | 11 | 12 |
| 13 | 14 | 15 | 16 | 17 | 18 | 19 |
| 20 | 21 | 22 | 23 | 24 | 25 | 26 |
| 27 | 28 | 29 | 30 | 31 |
Tags
- context
- import
- Mac
- resource
- IntelliJ
- VirtualBox
- xargs
- lsof
- vscode
- Eclipse
- bash
- 네트워크
- DB 도메인
- Source
- web.xml
- netsh
- 줄바꿈 문자
- tomcat
- profile
- ssh
- maVen
- GIT
- Windows 10
- 단축키
- JavaScript
- Quartz
- find
- grep
- Windows
- port
Archives
- Today
- Total
develog
[git] fatal: refusing to merge unrelated histories 본문
unrelated histories 오류로 머지가 안되는 경우
$ git merge master
fatal: refusing to merge unrelated histories
--allow-unrelated-histories 를 사용해서 머지한다
$ git merge master --allow-unrelated-histories
Auto-merging aa.txt
CONFLICT (add/add): Merge conflict in aa.txt
Automatic merge failed; fix conflicts and then commit the result.
Comments