Welcome to OGeek Q&A Community for programmer and developer-Open, Learning and Share
Welcome To Ask or Share your Answers For Others

Categories

0 votes
645 views
in Technique[技术] by (71.8m points)

git - Refusing to merge unrelated histories during merge squash

I have 'dev' branch and when I am trying to merge it in to 'pre-prod' via 'squash' I am getting next error:

On branch pre-prod
Your branch is up to date with 'origin/pre-prod'.
git merge --squash dev
fatal: refusing to merge unrelated histories
question from:https://stackoverflow.com/questions/65882339/refusing-to-merge-unrelated-histories-during-merge-squash

与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…
Welcome To Ask or Share your Answers For Others

1 Reply

0 votes
by (71.8m points)
Waitting for answers

与恶龙缠斗过久,自身亦成为恶龙;凝视深渊过久,深渊将回以凝视…
OGeek|极客中国-欢迎来到极客的世界,一个免费开放的程序员编程交流平台!开放,进步,分享!让技术改变生活,让极客改变未来! Welcome to OGeek Q&A Community for programmer and developer-Open, Learning and Share
Click Here to Ask a Question

...