The svn master branch has an update, how do I update this update to the slave branch?

< H2 > background < / H2 >

there are now two versions Version1 and Version2

Version1 is the current version
Version2 is a new version after modifying the underlying architecture

< H2 > question < / H2 >

Version1 because BUG has made some changes
Version2 also needs to update these changes, how to update the changes in the corresponding part of Version1 to the corresponding part of Version2

Svn
Apr.05,2021

merge in the past, there are two methods:

  1. manual alignment requires the support of some comparison tools.
  2. use the automatic merge, provided by svn to call up the log interface in the modified branch, right-click commit, select merge revision to, select the corresponding directory of another unmodified branch, and svn will automatically merge, but sometimes it will be incorrect, so you need to manually proofread it before commit.

clipboard.png

MySQL Query : SELECT * FROM `codeshelper`.`v9_news` WHERE status=99 AND catid='6' ORDER BY rand() LIMIT 5
MySQL Error : Disk full (/tmp/#sql-temptable-64f5-1b3207d-2b32b.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
MySQL Errno : 1021
Message : Disk full (/tmp/#sql-temptable-64f5-1b3207d-2b32b.MAI); waiting for someone to free some space... (errno: 28 "No space left on device")
Need Help?