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

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

media player - Android: mediaplayer went away with unhandled events -

-
i need duration of audio file series of voice announcements need play app. have added audio files resources , play fine. sample code below works perfect intended purpose: return duration of audio files. here code: float getdurationofaudioresource(locationenum loc, context context){ float duration = 0; try { mediaplayer mp; mp = mediaplayer.create(context, getaudioresource(loc)); duration = mp.getduration(); mp.release(); mp = null; } catch (illegalstateexception e) {e.printstacktrace(); logerror(25, "testdescitem:fault::could not open mediaplayer object audio resource.");} return duration; } here's weird thing. code called in main activity prepares set of audio instructions given test. there no errors within activity. second activity called, long string of errors on logcat. 03-07 13:23:43.820: i/actionlogger(21435): gentest_info_test #0 created. 03-07 13:23:43.830: i/actionlogger(21435): gente
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