How to restructure documentation that has versions?

Greetings,

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 Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

Learn more
Community showcase
Posted Jun 06, 2018 in Bitbucket

Do you use Bitbucket Cloud and Jira Cloud? If so, let us know!

Hi Community, I'm Julia and I'm on the Jira Software Cloud marketing team!  We're looking for companies or teams using Bitbucket Cloud and Jira Software Cloud. If your team fits the t...

87 views 3 3
Join discussion

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