github - Git, ignored files appear in every branch -

-

i have repo test-repo, contains 2 branches master , dev. files / directories in master branch's .gitignore files appear locally in both branches when git checkout them, assume normal behaviour files aren't being tracked git they're in test-repo directory no matter what. don't want happen. ideal setup below:

when git checkout master local file / directory structure should so:

test-repo/   .gitignore (this file contains `should-be-ignored.md`)   should-be-ignored.md   should-only-show-in-master.md

when git checkout dev local file / directory structure should so:

test-repo/   should-only-show-in-dev.md

if has idea on how achieve setup i'd appreciate it.

the real-world version: i'm working on github, when add branch of gh-pages acts free static web hosting essentially. have repo contains front-end web build boilerplate, master branch contains code , gh-pages branch include examples of code etc. when i'm working on boilerplate locally run grunt (a task runner) run needs command npm install installs dependencies, creates directory of node_modules in root of repo, don't want show on remote repo put directory in .gitignore file. in dev branch (locally) directory still shows up, if wanted separate grunt tasks files in dev branch? mean i'd need node_modules directory in branch, can't done since 1 master branch in local directory no matter what. see problem now?

with additional context have provided regarding gh-pages (thought bit confused master , dev branches coming in picture):

the gh-pages branch separate repo , serves different purpose (usually documentation.)

what not keep checking out between code branch , gh-pages branch. clone repo 2 times , have 1 normal development, , other gh-pages stuff. keeps simple, , 2 treated 2 repos, should be.


Comments

Post a Comment

Popular posts from this blog

database - VFP Grid + SQL server 2008 - grid not showing correctly -

-
i having problem, have grid called "gridbasica" , this: thisform.gridbase.recordsource = "sgviemp" sgviemp cursor made executing select sqlserver command sqlexec. when want modify registry, go form , the update there. so, when come form grid, grid isnt grid anymore, big white rectangle. reading around said: delete recordsource , asingt again. thisform.gridbase.recordsource = "" *--i sqlexe here thisform.gridbase.recordsource = "sgviemp" i , works, but, when click button modify again cursos updated modify form doesnt load fields did first time. could me out that? thanks in advance. --------------- edit ------------------ i have been doing recommended: lnselect = select(0) n = sqlexec(thisform.conexion,"select emp_ccodigo codigo, emp_cnombre 'nombre o razon social', emp_cnumrif 'r.i.f' sgviempr","sgviemp1") set echo on suspend select sgviemp zap in sgviemp *-- browse *--zaps correct
Read more

jquery - Set jPicker field to empty value -

-
im using jpicker color selector in form. have clear value set window/icon 'no color selected' state. i've tried following: $(':input[name="color"]').val(''); //access value directly. (does not affect jpicker) 2: $.jpicker.list[0].color.active.val('hex', '', this); //set color black , input value 000000, instead of empty string 3: $.jpicker.list[0].color.active.val(null, '', this); //does nothing none of 3 methods seems behave properly. in advance. this works me :) $.jpicker.list[0].color.active.val('v', null); here example: http://jsfiddle.net/3up7n/
Read more

.htaccess - htaccess convert request to clean url and add slash at the end of the url -

-
ok , searched more 4 days , more 20 posts here in stach or in websites without kind of success first here htaccess file rewriteengine on rewriterule ^([a-za-z0-9_]+)/?$ index.php?page=$1 [nc] rewriterule ^([a-za-z0-9_]+)\/([a-za-z0-9_]+)\/?$ index.php?page=$1&action=$2 [nc] i tried many codes 1 worked me can call request , works me www.example.com/pagename => www.example.com/index.php?page=pagename here questions , please provide me information "in detail" understand code well 1- how convert request automatically www.example.com/index.php?page=pagename www.example.com/pagename 2- if tried add slash @ end shows me page without images or styling mean www.example.com/pagename => works www.example.com/pagename/ => doesn't work that's :) for first part need 301 rule this: rewritecond %{the_request} /index\.php\?page=([^\s&]+) [nc] rewriterule ^ /%1? [r=301,l] for second part use absolute path in css, js, images files r
Read more