Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Next challenges

Recent achievements

  • Global
  • Personal


  • Give kudos
  • Received
  • Given


  • Global

Trophy case

Kudos (beta program)

Kudos logo

You've been invited into the Kudos (beta program) private group. Chat with others in the program, or give feedback to Atlassian.

View group

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

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 in DevOps

Step up your DevOps game webinar Q&A series - Questions answered!

  On October 21st, 2020 we hosted a webinar titled,   Step Up You DevOps Game with 4 Key Integrations for Jira and Bitbucket. We had a great showing and high engagement, but that meant th...

117 views 0 1
Read article

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