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

C# random value from dictionary and tuple -

-
i have following code, , need random item contains string "region_1" dictionary. public static dictionary<int, tuple<string, int, currencytype>> itemarray = new dictionary<int, tuple<string, int, currencytype>>() { { 0xb3e, new tuple<string, int, currencytype>("region_1", 1500, currencytype.fame) } }; public static int generateitemid(string shopid) { var generateditem = itemarray.elementat(new random().next(0, itemarray.count)).key; } how select this? it's not possible efficiently... first create static random @ class level... prevent non-random behaviour if run query on short period of time... (it's seeded discrete clock) static random rnd = new random(); then: var item = itemarray.values .where(t => t.item1 == shopid) .orderby(_ => rnd.next()) .firstordefault()
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

cgi - How do I interpret URLs without extension as files rather than missing directories in nginx? -

-
so i'm trying install zoneminder , have run under nginx, has few compiled files need run using fast-cgi. these files lack extension. if file has extension, there no issue , nginx interprets file , return 404 if can't find it. if has no extension, assume it's directory , return 404 when can't find sort of index page. here have now: # security camera domain. server { listen 888; server_name mydomain.com; root /srv/http/zm; # enable php support. include php.conf; location / { index index.html index.htm index.php; } # enable cgi support. location ~ ^/cgi-bin/(.+)$ { alias /srv/cgi-bin/zm/; fastcgi_pass unix:/run/fcgiwrap.sock; fastcgi_param script_filename $document_root/$1; include fastcgi.conf; } } the idea is, under cgi-bin directory goes through fastcgi pipe. any idea on howi can fix this? upon closer inspection, realized zoneminder has 2 cgi sc...
Read more