git - Branching: different config files for release/development -

-

i've inherited project , using git. have number of environments (dev, test, prod). previous team recreated on each instance, using same accounts, passwords, sid, etc. thing changed hostname mappings in /etc/hosts. connect different database server.

now, creates problem, because can't, example copy schema developer can run experiment using same database instance main development server. have create new database instance on host, , change /etc/hosts point new server.

while working setup, i'm trying find way maintain different config files each instance. ie: different versions of applicationconfig.xml depending on branch. i'm guessing 1 argue keeping database credential in repo not such great idea, lets ignore second.

another situation might warrant having different version of file debugging. i'm using javascript logger framework, , add debug code wouldn't want ship production release. don't want have add logger stuff when developing/testing , remove again before releasing. 1 might forget it.

what's proper way deal different "versions" of file different branches? there way have branch remains in sync latest code on master, few config/code files changed? don't expect remain in sync automatically, i'd able not merge config files (or parts of them), while not ignoring them (?). example: don't merge lines 6,7 (db username , password), merge other changes files.

it sounds should read on git attributes. check out section @ bottom of page

this helpful if branch in project has diverged or specialized, want able merge changes in it, , want ignore files. have database settings file called database.xml different in 2 branches, , want merge in other branch without messing database file.


Comments

Post a Comment

Popular posts from this blog

delphi - How to convert bitmaps to video? -

-
Image
my application creates images fractals , love feeling of 'flying' around fractal. once saved 2000 bitmaps file , created avi using premiere. experience rather frustrating though succeeded in creating movie. spectacular. of course want create video application. don't care niftyness of codec, compression or whatever. want have video can replay on systems. in past have tried never succeeded. triggered question alas not ffmpeg running. update i decided adapt question , put bounty it. have seen several solutions attractive (because it's simple) seems me taviwrite. tried taviwriter did not succeed. in procedure taviwriter.write; function call around line 370 avierr := avisavev(s, // pchar(filename), nil, // file handler nil, // callback nstreams, // number of streams streams, compoptions); // compress options
Read more

jasper reports - Fixed header in Excel using JasperReports -

-
how can create excel report fixed header using japserreports? mean need header fixed when scroll excel file. this possible adding couple properties in jrxml file each report. take @ advanced excel features freeze panes. if wanted freeze after first column header (down left side basically) this: <statictext> <reportelement style="sans_bold" mode="opaque" x="0" y="60" width="104" height="20" forecolor="#ffffff" backcolor="#666666"> <property name="net.sf.jasperreports.export.xls.auto.filter" value="start"/> <property name="net.sf.jasperreports.export.xls.column.width" value="110"/> <property name="net.sf.jasperreports.export.xls.freeze.column.edge" value="left"/> </reportelement> &
Read more

python - ('The SQL contains 0 parameter markers, but 50 parameters were supplied', 'HY000') or TypeError: 'tuple' object is not callable -

-
import pyodbc,nltk,array cnxn = pyodbc.connect('driver={mysql odbc 5.1 driver};server=127.0.0.1;port=3306;database=information_schema;user=root; password=1234;option=3;') cursor = cnxn.cursor() cursor.execute("use collegedatabase ;") cursor.execute("select * sampledata ; ") cnxn.commit() s=[] j=[] x=[] words = [] w = [] sfq = [] pos=[] entry in cursor: s.append(entry.injury_type),j.append(entry.injury_desc) nltk.tokenize import punktwordtokenizer nltk.corpus import stopwords tokenizer = punktwordtokenizer() english_stops = set(stopwords.words('english')) in range(0,26): # filter stop words tokenizer.tokenize(j[i]) w.append([word word in tokenizer.tokenize(j[i]) if word not in english_stops]) in range(0 , 26):#converting tokenzied text ito string sfq.append(" ".join(w[a])) replacers import regexpreplacer replacer = regexpreplacer() in range (0,26):#pos tagging replacer.repl
Read more