How to restructure documentation that has versions?


I'm new to SourceTree, thus wondering what would be the best way to perform the following. Below is my scenario:

I need to revamp (restructure) a repository that consist of the main documentation with versioning ( 2.0, 2.1, 2.2, 3.0, 3.1 ). I'm currently editing the 3.2 version, some files need to be removed and screenshots replaced ( due to minor UI changes ). However, some of the removed files would need to be in the future release 4.0.

I'm unsure about the configuration, but the auto merge function seems to be causing the errors when making the 

changes. Currently, each version is a release branch, though some versions are based branches i think.

Thanks in advance for the help

1 answer

Read this. Afterwards you will better understand how to work with the auto-merging workflow.

Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

638 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot