I have a root from which two people have created two separate branches. Lets say b1 and b2. Both of them take the latest code form the root and start working on their respective branches. Now the person working on branch b1 completes his work and merges his branch to the root. After this the person working on branch b2 also completes and tries to merge his branch. But now the root has changed because b1 has been merged to it. So the person working on b2 does not have the latest root. There is a risk of data loss due to overwrite. Is there a way in which the person knows when was the root last updated. Also what can be done in this situation. Please help as I am new to SVN.
Mantain latest code between two branch merge
99 Views Asked by Kartik Gaur At
2
There are 2 best solutions below
0
Sergey Azarkevich
On
If root contains not significatn changes, then b2 can be merged directly into root. Subversion will take care to merge differences. If Subversion can't merge it brings conflicts, but not silently overwrite files.
If user2 decide that root contains significant changes, then he should:
- merge root into his branch (b2). Resolve conflicts, run test, may be fix found issues
- merge b2 to root
Related Questions in SVN
- Cannot load modules/mod_dav_svn.so into server
- Created Jenkins pipeline and added the script in the Pipeline Description.To check out the Project from the svn repository.NotWorking. Any Suggestion
- How to host SVN server on Cloud
- In two subversion repositories (same machine), can I have different usernames with no password prompting?
- Unrelated git histories when moving code from SVN to Git
- Convert local SVN to GIT using Tortoise GIT fails with unable connect?
- Jenkins Pipeline Script Check-in SVN using NPM
- Making latest subversion exec point to my restored subversion data directory
- Can anyone help on this "svn merge" problem?
- clone repo from SVN to GIT: unable to connect to a repository
- Possible to recursively serve an existing SVN checkout folder to another computer?
- How to push certain branches into git repository?
- Subversion svn merge failure
- Jenkins: SVN Checkout missing commit message
- SVN same setup, same user, fine from one machine but from another DAV/PROPFIND error
Related Questions in MERGE
- Purpose of last 2 while loops in the merge algorithm of merge sort sorting technique
- Having trouble merging these two datasets for a Spatial Analysis
- Merge Azure mp4 blobs via API (Preferred Azure)
- Git merge strategies vs. merge drivers vs. mergetools
- Merge Request in Bitbucket: Possible to exempt a specific branch to ask for Merge Request?
- How to properly extend the generic interface with a new generic parametr using decration merging in Typescript?
- Merge effective dated records of an attribute with the main effective dated table (SQL)
- How do I merge multiple tables into a new table in BigQuery?
- Exclude a file from merging to the main branch
- Usage of merge in linux sort utility
- How can I collapse repeated missing observations into a single nonmissing observation for the same ID in SAS?
- Best way to automate auto-merging git branches
- git: merging a branch that's already been merged by mistake
- Dynamically create, merge & save dataframes in a for loop
- VBA find matching Excel files with a subtext - and merge them into single new file
Related Questions in TORTOISESVN
- Possible to recursively serve an existing SVN checkout folder to another computer?
- How to forbidden trotoiseMerge in Vs2017 use the built-in merge tool
- SVCS Configuration in Keil Uvision
- Tortoise SVN and Unreal - lock specific files on server repo
- Connection to SVN repositories fails after updates to NAS Synology DS710+
- svnserve authentication fails after adding new user
- Add a costum column in log in Tortoise Subversion (TSVN)
- Is there a way to append one svn trunk onto another, including the change history?
- SVN File Deletion and Recreation Behaviour
- Recursive ignoring and not-ignoring with tortoise-svn and with command line svn
- Tortoise error for creating entity with created_at & updated_at
- TortoiseSVN client closes connection after TLS 'server hello'
- How to install Tortoise TTS + RVC (no matter which one)?
- Restrict Delete from SVN repo browser
- Adding commit message to top of .c/.h files in TortoiseSVN
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular # Hahtags
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
You may use :
to see the log message of trunk, to know if there is new update and when.
If you want to merge all trunk's new codes to your branch, i.e., b2, run following command at root of b2's working copy:
Hope it helps.