GIT Rebase Fatal on Multiple 0.5GB Binary Files

前端 未结 3 1646
刺人心
刺人心 2021-02-19 22:45

[This question is essentially reopening git crash during rebase which never had an answer]

I\'m attempting to a rebase from my \'secc\' branch as:

$ git          


        
3条回答
  •  再見小時候
    2021-02-19 23:11

    Try putting these in .git/info/attributes:

    # whatever gets them...
    yourfile binary -delta merge=binary
    *.yourext binary -delta merge=binary
    

    that'll cause merge conflicts if those files change, and you'll have to figure out what to do with them. check the gitattributes and rebase doc for other merge strategies, I'm not even going to name the dangerous ones here.

    I'm not sure it's the actual merge trying to get the whole thing in core from running, but it seems worth a try.

提交回复
热议问题