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

Stash: Merge two branches regularly

I have a dev branch created from master and I would like to setup a regular daily merge between these two branches or whenever a commit is done in master branch. How can I do this in stash, or should I write sctipts to merge two branches.

2 answers

1 accepted

0 votes
Answer accepted

Hi Subramanian,

There isn't currently a way to do that in Stash. Personally I would use a CI server like Bamboo/Jenkins to schedule a script that merges the two and pushes back to dev.

That said, have you seen the Stash Automerge feature, although I'm not sure it works between the dev/master branches. Generally if you have two master branches that you need to keep in sync the upstream branch should _always_ contain all changes from the downstream. In this case if you're making changes in master that need to be in dev it should be the developer who made the changes that should have to deal with the conflicts, not someone in charge of the daily build.

Does that make sense?

Charles

I am evaluating stash and currently we are pulling all the commits from hg to git ( master branch ) and then get it merged to dev branch , where we have done local changes to get it built using CI tool. Right now I create a pull request and merge those two branches ( ideally there is no conflict ).

Suggest an answer

Log in or Sign up to answer
Community showcase
Published in Bitbucket Pipelines

Building a Bitbucket Pipe as a casual coder

...ipe.sh :  #!/bin/bash source "$(dirname "$0")/common.sh" enable_debug extra_args="" if [[ "${DEBUG}" == "true" ]]; then extra_args="--verbose" fi # mandatory variables R...

4,081 views 4 22
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