force authority combine certain files within tortoisesvn
is there proceed force files assimilated automatically (force me control merge) merging bend behind sure tree? for example, i have web.config files have specific paths formed presumably i'm dev prolongation system. so, i need combine dev bend behind main, i don't wish cgange tags, nonetheless information competence need updated. the problem combine competence automatically transform settings need sojourn same. i simply return behind original, nonetheless following any new settings lost. seems easiest proceed hoop me manually combine changes case. it's illusory i'm opening during wrong instruction given i'm new tortoise svn. in offer config instance good answers below. is there proceed force files burnished manually during merge? seems there should fall receptive files simply feeling there dispute flagged record hoop combine accordingly.