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

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

Merge two branches and proceed working on those

Hello,

my college and I are working together on one software. We are using bitbucket server and sourcetree.
We want from time to time, maybe once per week, to merge our projects that everyone has the progress of each other. 
I am quite new to git and so I am still searching for the right workflow to handle this. 

Now, each of us has its own branch where we are working on. If I want to merge, I create a pullrequest on the bitbucket server (not on sourcetree) and then I goto sourcetree and pull the branch of my college. If I have done this, the branch of my college is allready merged into my branch. So far so good.
Now my college needs to get the new changes. And here, I don't know whats the best way. Should we make a second pull request or should we make a new branch? What do you think is the best way to handle this?

I already searched for some hints but I didn't find anything helpfull. Maybe I search for the wrong things. So I really would appreciate if you can give me some tipps.


Thanks a lot in advance!
Best regards,
Simon

0 answers

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
SERVER
TAGS
Community showcase
Published in Bitbucket

New improvements to user management in Bitbucket Cloud 👥

Hey Community! We’re willing to wager that quite a few of you not only use Bitbucket, but administer it too. Our team is excited to share that we’ll be releasing improvements throughout this month of...

3,821 views 10 16
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