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
