Donate. I desperately need donations to survive due to my health

Get paid by answering surveys Click here

Click here to donate

Remote/Work from Home jobs

Using BFG on repo with subtrees

using BFG on a repo with subtree works fine, but If I want to pull updates or so from the subtree, then I get a conflict, Is there any way to make this work?

Comments