version control - Best practice: Want to partially pull commits with git -

-

i'm in charge of department webserver, has lot of small, one-page modules (most of them display dynamically-generated reports), , larger ones consist of 5-20 different html pages. of done in perl, few java helpers here , there.

there 2 servers: production one, , dev server, , it's unlikely third ever added. department wants quick turnaround times, when comes in office asking "can produce report how many foos in bar on last 12 months", want web page in production after hour or 2. don't have complicated build-and-deploy process - generally, build page on dev server, test it, git commit , git push on dev server, , git pull on production. works everybody.

now problem is, when work on bigger project, want use git changes, if don't want make them live yet. , @ same time, want able interrupt bigger project, small task, commit-push-pull small task, , omit big-project file pull. example,

git commit -m "first attempt, not finished yet" bigproject/file1 bigproject/file2

then

git commit -m "reversed foo , bar" smallfix/file3

and pull file3, not file1 , file2 production.

as far understand git, tags won't me, because can pull "everything precedes tag", , branching doesn't either, because i'd have commit everything, change branch, work there, commit again, change - , i'd need know branch want work on before touching code.

so right now, i'm using 2 sandboxes on same machine , use 1 short-term stuff, long-term things, doubt best way solve problem. how do "correctly" / git?

it sounds branching want. check out git flow (http://nvie.com/posts/a-successful-git-branching-model/).

what sounds you're describing wanting long-running development doesn't deployed until ready, not block release of further code because of changes. git flow (and other branching strategies) solves having feature branches merged main development branch, , further master branch releases. it's worth reading article merits of each one, short walkthrough be:

  1. i create feature branch big-project-x, branched develop.
  2. i work on project while, committing go.
  3. bob comes in says "i need report y", create report-y feature branch, taken develop , doesn't include big-project-x changes.
  4. i complete report-y, merge develop , push changes server.
  5. to make life easier merge develop big-project-x it's got latest changes.
  6. some time later finish big-project-x, merge develop , push server.
  7. celebrate!

to address of downsides mention:

  1. git commits cheap, if you're switching working on else it's idea commit anyway.
  2. if you've done load of changes , realise you're on wrong branch, may able git checkout branchname , commit, if there conflicts can use git stash, git checkout branchname followed git stash apply. stash great way store changes short time while jump around.

it take little bit of rigour habit of branching often, once used see power of git , lightweight branching model. need put effort making sure long-running branches don't go stale (merge develop), that's simplest way can suggest managing development of fast- , slow-paced items on same codebase.


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

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

.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