SVN-basic record of usage method

table of Contents

1. Create an SVN project from scratch

1. Create a folder MilkXXXProj, and then operate as shown below.

2. Open the panel as shown below and create several main commonly used directories under it

3. Related to making game main catalog

4. Make game Tags (phased) branch

5. Check out the branch

6. Merge the content of the main trunk into the branch (similar to merging the branch into the main trunk)


1. Create an SVN project from scratch

1. Create a folder MilkXXXProj, and then operate as shown below.

2. Open the panel as shown below and create several main commonly used directories under it

3. Related to making game main catalog

Create a new folder named "GameProjectName" in the trunk directory, followed by a series of explanations of checkout, Add, Submit, and view Log

You only need to submit the entire contents of the Assets and ProjectSettings folders, and ignore everything else.

This error is that Directory'xxx' out of date means that it hasn't been updated for too long. You are asked to update it before submitting. Click OK and you will be prompted to Update.

Go to the directory , right-click in the blank area and view the Log submission log, you can see what we submitted.

4. Make game Tags (phased) branch

The stage branch directory is actually different from the main directory in that you divide it. It is a copy directory divided by each stage of your game main. Its SVN operation is exactly the same as that of the main branch. For example, you can check it out. When you arrive locally, you can happily do something on the branch, but generally you don't do anything directly on the branch. Instead, you can merge these functions into the branch after you develop and test the main trunk. So how to merge?

5. Check out the branch

6. Merge the content of the main trunk into the branch (similar to merging the branch into the main trunk)

Submit a txt file from the local backbone project to SVN

View the submission Log and select the Revision item to be merged (multiple selections are available), right-click Merge revision to...

Note: At this time, the directory where Log is opened is Assets, so the directory selected during Merge should also be the corresponding Assets, otherwise an error will not be reported!

In general, you will encounter a lot of conflicts ~ how to resolve conflicts? Follow-up~

Guess you like

Origin blog.csdn.net/qq_39574690/article/details/109685449