Effects of Using SourceTree Git-Flow on a non-Git-Flow project

I am using SourceTree in Windows, with a group that is not set up for Git-Flow, and I want to use Gti-Flow locally. They have a "develop branch", but their production branch is named "trunk". I don't want to do anything to mess up their repository, but I want to use Git-Flow locally to manage my feature development. When I click the "Git-Flow" icon in SourceTree, it gives me a dialog entitled: "Initialise repository for Git Flow". If I put "trunk" in place of "master", will that have an effect on THEIR repository, or will the effect be just local?

1 answer

All effects will be local, except if you push changes to their branches. The 'master' branch is where releases are merged into, so if you put 'trunk' in there and then used the 'finish' option on a release or hotfix, then it would merge your release / hotfix branch into trunk and that would affect their trunk if you pushed those changes. If you only used features, then your feature branches will be being merged into develop in the standard configuration, again those would appear if you pushed them. However any git-flow configuration remains local only.

I will only be doing feature branches and when I finish, they generally merge into develop, so I was thinking that master (trunk in their case), should not be effected.

Yes, if you only use feature branches then master/trunk won't be merged to, only develop. It's releases and hotfixes that merge to master.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Thursday in Summit

Find a your Summit 2019 Buddy!

Can you believe there's less than one month until Summit 2019? It's time to start planning your agendas, not to mention packing ... In the meantime, introduce yourselves on this thread so that you ...

355 views 25 7
Read article

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