Subversion Branch/Trunk Best Practice - keeping Branch Up-to-Date?

后端 未结 5 1541
离开以前
离开以前 2021-01-31 10:12

My development team has worked with subversion for quite some time. The way that manage the trunk and branches is as follows:

  • We (almost) always release from t

5条回答
  •  夕颜
    夕颜 (楼主)
    2021-01-31 10:58

    First, I wholeheartedly agree with the previous responders that there is no one-size fits all solution.

    In our case, we have many relatively small applications, with each application normally having only a single developer. When we do engage in collaborative development, there tends to be only 2 to 4 developers.

    Our general policy is:

    • The trunk contains the current project state;
    • We use branches for developing new features, bug fixes, etc. Branches are merged back to the trunk when complete;
    • To release, we create a tag from the current trunk and release the tag.

    Andy also made an important point that needs emphasizing: "Proactively teach people how to merge well." Many, if not most of our problems seem to arise from poor merging practices.

提交回复
热议问题