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 best solutions below
Related Questions in SVN
- Why does the Jenkins SVN plugin give error E170001 when connecting to my VisualSVN server?
- How to find the Git Revision Hash in a synced SVN repo using SubGit?
- In SVN, what's the different between "merge from a to b" an "merge from b to a"?
- Revert back to older version in TortoiseSVN and Commit
- SVN - folder checkout and merges
- Automatically Compile .Net UserControls
- SVN update not working
- maven-scm-plugin 1.9.4 - too old to work with working copy
- git-svn problems creating tags
- Sonarqube SVN Plugin fails with code E155007 'is not a working copy'
- Install Subversion 1.7 on Debian jessie
- How to customize svn date format
- Reverse Merge and svn:mergeinfo
- Automatically deploy latest revision to website from SVN server
- What is a generic name for SVN's "trunk", "tags" and "branches" directories?
Related Questions in MERGE
- Sub-directory into independent repository and later merge back into main repository
- R: Avoid loop or row apply function
- neo4j load csv invalid "ON MATCH"
- PIG merge two lines in the log
- In SVN, what's the different between "merge from a to b" an "merge from b to a"?
- git merge "deleted by us"
- Merge sort using CUDA: efficient implementation for small input arrays
- Merge project from other branch git
- Get a single line representation for multiple close by lines clustered together in opencv
- merge or mutate a summary (dplyr)
- How to I combine data from two XML files into the same structure?
- Merging PDF files with similar names using PDFTK and a bash script
- git has problems with squashing commits once there is "Merge branch"
- How can I combine elements at the same index from separate lists?
- Merging two sorted stacks
Related Questions in BRANCH
- How to have Heroku build my development branch on a staging server?
- Merge project from other branch git
- Delete branch in clearcase in Eclipse using GUI operation
- Modify files and commit after Branch creation in GIT via Hook
- How can I retrieve the local changed files which I wrongly reset in git
- Create a branch from master with removed code
- Can I use `diff ...` as an indicator for branch cleanup?
- Merging strategy with a long development branch. How to prevent heavy conflicts in the future merge?
- Checkout branch on different remote
- How to list remote branch without web request?
- Show git branch in file explorer
- Git won't see remote merge
- MIPS, why this branch doesn't work?
- Creating new branch in github but it isn't current?
- Associate specific paths in Atlassian Fisheye with Perforce branch mappings
Related Questions in HEAD
- Is there a way to emulate the head command in Windows cmd?
- Fanelli face detection - PCL code vs. author's implementation
- Prolog-iterating through list
- function similar to head() for matrix
- HTML: How to initiate HTML document header
- Head pose estimation opencv
- Pattern Lab: changing the title
- javascript refuses to work in head/external file
- head command - find first line of non-whitespace
- Git push to refs/heads/master fails on my mac, how to fix?
- Remove the default css styles tag in wp_head
- tablesorter stickyhead widget enabling checkboxes jumps to top of the table
- How to include different meta tags for each page dynamically within site to be seen in Google search
- Doubly Linked List with different type of head
- rel-canonical prev/next when head can not be written
Related Questions in SVN-REINTEGRATE
- Svn reintegrate a branch in a new trunk-copied-branch
- How to exclude specified files from SVN reintegrate branch?
- How to reintegrate a SVN branch into trunk with Netbeans?
- not able to integrate to master branch because of earlier revert
- When is the reintegrate option really necessary?
- Can I `reintegrate` using a specific range of revisions?
- SVN merge reintegrate missing ranges but nothing to merge
- how to do svn reintegration of branches using command line
- Reintegrating a branch (like svn merge --reintegrate) using svnmerge.py
- Subversion reintegrate mergeinfo Reverse-merged - how to undo?
- Missing ranges error message when reintegrating a branch into trunk in Subversion 1.5
- Do I need to reintegrate if I don't merge from trunk in Subversion?
- SVN Code merging between multiple branches problems
- Is it wise to merge changes from head to branch?
- svn branch to branch merge
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 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?
"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.