It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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
Community showcase
Posted in Off-topic

Do you still play the same games you played when you were a kid?

Months ago, I was walking in a huge grocery store and I went to the toys aisle and found a jigsaw puzzle that was more than 50% off, and I thought "why not? It will be fun and it can be a beautiful f...

222 views 21 10
Join discussion

Community Events

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

Events near you