Is it possible to merge feature branches into the main branch after using BFG?

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.

1 answer

1 vote

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.

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Friday in Off-topic

Friday Fun: Riddle me this

Happy Friday, Funmakers! We had a Community Team offsite in Austin this week, and my mind feels primed for thinkin' from all the brainstorming we did!  So, this week's Friday Fun thread w...

145 views 19 3
Join discussion

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you