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
Read this. Afterwards you will better understand how to work with the auto-merging workflow.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.