Golfreeze.packetlove.com: Life style of Golfreeze Canon400D Family kammtan.com Jazz Freebsd Unix Linux System Admin guitar Music

All about unix linux freebsd and FAQ for Packetlove.com Web hosting , Mail hosting , VoIP + IP PBX server => เกี่ยวกับ docker ทุกอย่าง , ci/cd , gitlab, github => Topic started by: golfreeze on พฤศจิกายน 23, 2019, 10:03:14 PM

Title: git fatal: refusing to merge unrelated histories
Post by: golfreeze on พฤศจิกายน 23, 2019, 10:03:14 PM
$ git pull origin master

From https://github.com/mkyong/java-concurrency
 * branch            master     -> FETCH_HEAD
 
fatal: refusing to merge unrelated histories

ทำการแก้ไขโดย

$ git pull origin master --allow-unrelated-histories

From https://github.com/mkyong/java-concurrency
 * branch            master     -> FETCH_HEAD
Merge made by the 'recursive' strategy.
 LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 674 insertions(+)
 create mode 100644 LICENSE

แล้วทำการ push ใหม่อีกรอบโดยเริ่มจาก

$git add .
$git commit -m "Add Staging 1"
$got push -u origin master