I have 2 branches what I'm reintegrating
In both branches I have same CFG files what I dont want to be reconciled.
Wanted keep them versioned but not reconciled.
Do you know any way how to exclude specified files from this process?
How to exclude specified files from SVN reintegrate branch?
1.3k views Asked by Maciej At
1
There are 1 answers
Related Questions in SVN
- sendxmpp not authorized failure (Error AuthSend)
- C# agsxmpp Domain vs connectionserver
- Android Smack4.1.1 XMPP FileTransfer Issue with Iphone
- How to login with recently registered user to openfire in ios?
- Server less Group Messaging (chating) Xmpp
- SASLException not authorized using smack 4.1.1
- Android aSmack - How to make custom message extension for file sending?
- Unable to receive upstream GCM messages with Node.js + XMPP
- Is Node-XMPP useless ? Choosing XMPP server
- Allow ejabberd_service (Jabber Component Protocol) to modify user's roster
Related Questions in TORTOISESVN
- sendxmpp not authorized failure (Error AuthSend)
- C# agsxmpp Domain vs connectionserver
- Android Smack4.1.1 XMPP FileTransfer Issue with Iphone
- How to login with recently registered user to openfire in ios?
- Server less Group Messaging (chating) Xmpp
- SASLException not authorized using smack 4.1.1
- Android aSmack - How to make custom message extension for file sending?
- Unable to receive upstream GCM messages with Node.js + XMPP
- Is Node-XMPP useless ? Choosing XMPP server
- Allow ejabberd_service (Jabber Component Protocol) to modify user's roster
Related Questions in VISUALSVN
- sendxmpp not authorized failure (Error AuthSend)
- C# agsxmpp Domain vs connectionserver
- Android Smack4.1.1 XMPP FileTransfer Issue with Iphone
- How to login with recently registered user to openfire in ios?
- Server less Group Messaging (chating) Xmpp
- SASLException not authorized using smack 4.1.1
- Android aSmack - How to make custom message extension for file sending?
- Unable to receive upstream GCM messages with Node.js + XMPP
- Is Node-XMPP useless ? Choosing XMPP server
- Allow ejabberd_service (Jabber Component Protocol) to modify user's roster
Related Questions in SVN-REINTEGRATE
- sendxmpp not authorized failure (Error AuthSend)
- C# agsxmpp Domain vs connectionserver
- Android Smack4.1.1 XMPP FileTransfer Issue with Iphone
- How to login with recently registered user to openfire in ios?
- Server less Group Messaging (chating) Xmpp
- SASLException not authorized using smack 4.1.1
- Android aSmack - How to make custom message extension for file sending?
- Unable to receive upstream GCM messages with Node.js + XMPP
- Is Node-XMPP useless ? Choosing XMPP server
- Allow ejabberd_service (Jabber Component Protocol) to modify user's roster
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)
Assuming the working copy (being merged) has no local modifications before the merge, can't you just revert those configuration files after the reintegration is done, but before you commit?
Another option is if the changes to the configuration file(s) are committed separately from your other changes, then you could exclude those revisions from the merge. So instead of the branch re-integration option in TortoiseSVN, you could merge a range of revisions. More work for you though.