We decided to make a branch for some feature so we dont affect the head, now the question is it a good idea to keep merging changes from the trunc in our branch? would this meake the reintegrate easier at the end?
Is it wise to merge changes from head to branch?
116 views Asked by CloudyMarble At
1
There are 1 answers
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 BRANCH
- Xcode commits (possibly outside of any branch) disappeared, how to get them back?
- How to fix "this branch is 1 commit behind of master branch"
- How can I merge these two branches?
- Is there any way for QA to do the feature testing before each feature merged to sacred branches?
- speed up git clone when remote have so many branches
- Cleaning master branch to version from another branch, but save progress to new temp branch
- In Git how can I cycle through previously checked out branches?
- Feature and origin/Feature are separated in a Y shape
- Git how to pull the update from original repository and keep my own changes
- Pull request from feature branch into test branch shows changes that are already inside test branch
- Git rev-parse --abbrev-ref HEAD vs branch --show-current differences in a new init project
- git forward merging a couple of commits only
- ADF Publish Fail - Invalid references or dependencies found
- Merge dev to stage but only specific commits
- Odoo 17 Branches Configuration
Related Questions in HEAD
- ColdFusion - page with CFCHART inserts JS into HTML <head> - Test and Prod servers it is at top of <head> my local is at bottom and causes JS conflict
- Unexpected Error "file name too long" and bad output of `head -1` ending in ^M
- How to fix my Git HEAD after inadvertent branch push?
- How to send a HEAD request with WebClient in C#?
- Magic Link blocked by Outlook SafeLink policy
- Git Log After Git Fetch Upstream
- Difference Between HEAD and HEAD:HEAD
- The POST method is not supported for route admin/bill. Supported methods: GET, HEAD
- why does the 'head' command read the string starting with '\0' correctly, with fgets doing wrong?
- Multinational page head Google Analytics code differently
- Extending Title Service in Angular
- Why do `sort | sed '1,5p'` and `sort | head -n 5` behave differently when pipefail is in use?
- My header moves when changing the page, tell me how to fix it
- Coloring the head in html
- How can I load assets from the static folder in the head using Nuxt3 and nuxt.config.ts?
Related Questions in SVN-REINTEGRATE
- Can anyone help on this "svn merge" problem?
- how to do svn reintegration of branches using command line
- SVN wants to reintegrate on a sync merge
- Subversion reintegrate mergeinfo Reverse-merged - how to undo?
- git-svn: Rename branch and use it as new SVN 'trunk' instead of using "merge --reintegrate"?
- How to reintegrate with automatic merge (merge-tracking) in TortoiseSVN 1.8
- How to merge branch back to main branch and avoid tree conflicts - TortoiseSVN
- svn merge vs reintegrate - Example wanted
- SVN - Commit doesn't recognize files inside new folder
- Svn reintegrate a branch in a new trunk-copied-branch
- SVN Code merging between multiple branches problems
- Is it wise to merge changes from head to branch?
- How t reintegarte branch of branch in svn
- svn merge --reintegrate fails on "missing ranges"
- Reintegrating a Branch in Subclipse
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?
Popular Tags
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)
"Good idea" is too weak, it's a must. The longer life of the branch the more important such merges are.
According to SVN recommendations, at least one merge from trunk to branch should happen right before reintegration. In this case reintegration will be automatic, because you've already resolved any problems in your branch.
For short-lived branches this single merge at the end may be sufficient, but if many things happen on the trunk, it makes sense to synchronize more frequently.