The documentation for using BFG to migrate to Git LFS states that we should push all changes first and that "Any work that has not been pushed will be impossible to merge later" (https://confluence.atlassian.com/bitbucket/use-bfg-to-migrate-a-repo-to-git-lfs-834233484.html). Is just pushing changes sufficient, or do I need to merge everything into one branch too? I don't want to end up in a situation where I push my main branch and my feature branch, run BFG on both branches, and find that I can't merge the new feature branch into the new main branch.
Pushing is all that is needed.
In step one when you clone with the
--mirror flag it downloads all branches regardless of if they have been merged or not.
So as long as you get all developers to stop and push their branches and make NO changes until they have downloaded the BFG converted version then you will have no problem merging branches again.
Free training for Jira, Confluence, and Jira Service Management Start faster and be more productive with Atlassian cloud products. Take the guess work out of where to begin, and gain confidence wi...
Connect with like-minded Atlassian users at free events near you!Find an event
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no Community Events near you at the moment.Host an event
You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events