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
- profile
- tomcat
- context
- Eclipse
- plugin
- Windows 10
- find
- Mac
- GIT
- Source
- lsof
- xargs
- IntelliJ
- netsh
- ssh
- resource
- 단축키
- bash
- 네트워크
- Windows
- maVen
- import
- port
- VirtualBox
- Quartz
- grep
- vscode
- JavaScript
- web.xml
- 줄바꿈 문자
Archives
- Today
- Total
목록2024/10/17 (1)
develog
[git] fatal: refusing to merge unrelated histories
unrelated histories 오류로 머지가 안되는 경우$ git merge masterfatal: refusing to merge unrelated histories --allow-unrelated-histories 를 사용해서 머지한다$ git merge master --allow-unrelated-historiesAuto-merging aa.txtCONFLICT (add/add): Merge conflict in aa.txtAutomatic merge failed; fix conflicts and then commit the result.
카테고리 없음
2024. 10. 17. 17:14