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

What are the possible consequences of merging branches together?

Hi!

 

I'm new to Sourcetree and to working with Git/Github. I'm in a little bit of a bind: I've created 3 separate branches and made 3 pull requests, one for each branch. The reviewer would like all of the work on one PR. It looks like the best way to achieve this now would be to combine all of the work onto one branch, and then close the PRs for two branches that were merged.

 

I think I can do that from Sourcetree, and then push the changes to main branch, right?

Essentially, I'm wondering about potential problems/snafus in moving forward with this supposition. 

 

Thanks!

Sourcetree.jpg

1 answer

If you were working on different parts of code, then there should be no issues, final branch will have all changes from these branches.

If you were working on same parts, then it's possible to have all sort of merge conflicts. Usually it's easy to fix in your own code when you know how it should be.

One of issue I usually get is when one branch deletes file (e.g. code was split to different files) and another branch changes something in that deleted file. Then merge conflict can return this deleted file.

But everything depends on situation

@Justinas_Jurčiukonis , thanks for the reply! I got it all sorted out. :)

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,910 views 0 12
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