github - How to pull changes back to Git repository after some changes have been done on live server -

-

now have standard workflow work localy, push git repo , deployment git repo ftp, our clients use website, still find difficult additions or changes on website after time.

for example after year, when client wants add new things.

what - download files ftp run date website locally, push them git repo, needed, push again git , deployment live.

what want know - there way pull changes git repo live server have date website without need of downloading files again , uploading them all?

example: after year client wants new page - i'd pull live git, pull local environment. can edit website localy, push , deploy live server.

thank advice , ideas!

use git format-patch generate diff files (patches) , upload/download them.

git format-patch head~x // x number of commits need

here demo on how create patches , they.

enter image description here


Comments

Post a Comment

Popular posts from this blog

Load Balancing in Bluemix using custom domain and DNS SRV records -

-
i'm trying load balancing of application in bluemix using custom domain , srv record in dns manager. created own doamin ccbluemix.dynu.com , added custom domain bluemix. created application in region , created route custom domain myapp.ccbluemix.dynu.com deployed same application in uk region , created route custom domain myapp.ccbluemix.dynu.com there well. now whenever user hits route want load balancing between , uk region alternate requests served , uk regions. for created srv records like _http._tcp.ccbluemix.dynu.com srv eu-gb.mybluemix.net [priority: 0] [weight: 50] 10 _http._tcp.ccbluemix.dynu.com srv mybluemix.net [priority: 0] [weight: 50] 10 but nothing happening , i'm not able access application using custom route @ all. if create 'a' record cc-load-bal-app.ccbluemix.dynu.com 75.126.81.68 i can access app using custom route ends hitting server. how can achieve load balancing using srv records? wrong creating srv records here? i read ne...
Read more

oracle - pls-00402 alias required in select list of cursor to avoid duplicate column names -

-
my cursor : select xzis.msisdn msisdn, xzis.in_account_number in_account_number xxobw_zte_in_sync xzis not exists (select 1 hz_contact_points hcp, hz_cust_accounts hca hcp.owner_table_id = hca.party_id , hcp.owner_table_name = 'hz_parties' , hcp.phone_number = substr (xzis.msisdn, -8) , nvl (hca.attribute12, 'nil') = xzis.in_account_number); i have given alias columns, still facing issue. suggestions? it's cursor. 1 has no such problems. problem is, when you're joining 2 tables, or apply wrong aliases in subselect, cursor may @ end return 2 columns same name/alias. the problem not need alias, no 2 columns can have same alias (the name counting alias, when no alias given). apparently has happened, far can tell, it's ...
Read more

python - Consider setting $PYTHONHOME to <prefix>[:<exec_prefix>] error -

-
Image
i getting same error when python manage.py runserver. there no such error when have ubuntu 15.10. got started when upgraded ubuntu 16.04. question might duplicate have tried solution provided question have applied command dpkg --configure -a, have done apt-get update,upgrade,dist-upgrade, clean, -f install. have reinstalled python2.7 , python3 no success though. here screenshot while trying run django application i got after re-installing python please me? bashrc file # ~/.bashrc: executed bash(1) non-login shells. # see /usr/share/doc/bash/examples/startup-files (in package bash-doc) # examples # if not running interactively, don't case $- in *i*) ;; *) return;; esac export pythonhome="/usr/bin/python" echo $virtualenvwrapper_python echo 'tushant' # don't put duplicate lines or lines starting space in history. # see bash(1) more options histcontrol=ignoreboth # append history file, don't overwrite shopt -s histappend # setting h...
Read more