version control - New to git -- how do I get changes from cloned repo into original repo? -

-

this quite newb question, can't seem figure out.

here's did...

on server (via ssh):

  • created site on dedicated server
  • created git repo there (git init think?)
  • added , committed everything

at office:

  • cloned repo on development machine
  • pulled everything
  • made changes local files
  • added files again (is right? not svn!)
  • did commit
  • did push

...now, on server, if git show, shows diff server's last copy of stuff removed , stuff pushed office being added. that's want happen. can't figure out is: what need on server make changes pushed office become "live?"

i've had pretty success deploying websites svn in past, , figure can away with git too... i'm missing piece of puzzle. help.

edit - noticed post: git - pulling changes clone onto master

should pulling office repo onto server instead of pusing there? ssh office server , have git+ssh office pull repo? seems kind of crazy, i'd rather figure out how make push go through if possible.

rephrasing question

i want apply patch shown git show. git have built-in way of doing that?

answer

it looks git checkout -f on server did wanted, creating --bare repo have been better way go (i've changed setup now).

usually on server git init --bare creates repo no working directory. if route took have pull changes there web directory "deployment" step. work flow might like...

on dev pc:  1. git clone <path server repo>  *make code changes*  2. git commit -am "fixed bug"  *add new feature*  3. git commit -am "added cool new feature"  4. git push origin master   on server:  *cd www folder*  5. git pull
  1. clones server repo dev machine, you've done
  2. commits bug fix local repo...not server's repo
  3. commits new feature local repo...again, not server's
  4. pushes changes master branch server's master branch

at point, none of changes visible on website. need "deploy" them.

5.pulls latest changes central repo on server web server's folder(s) being served on web.

there git tutorials "pro git", free online book


Comments

Post a Comment

Popular posts from this blog

unicode - Are email addresses allowed to contain non-alphanumeric characters? -

-
i'm building website using `django. website have significant users non-english speaking countries. i want know if there technical restrictions on types of characters email address contain. are email addresses allowed contain english alphabets, numbers, "_", "@" , "."? are allowed contain non-english alphabets "é" or "ü"? are allowed contain chinese or japanese or other unicode characters? email address consists of 2 parts local before @ , domain goes after. rules these parts different: for local part can use ascii: latin letters - z - z digits 0 - 9 special characters !#$%&'*+-/=?^_`{|}~ dot ., not first or last, , not in sequence space , "(),:;<>@[] characters allowed restrictions (they allowed inside quoted string, backslash or double-quote must preceded backslash) plus since 2012 can use international characters above u+007f , encoded as utf-8 . domain part more res...
Read more

c++ - Convert big endian to little endian when reading from a binary file -

-
this question has answer here: how convert between big-endian , little-endian values in c++? 28 answers i've been looking around how convert big-endian little-endians. didn't find solve problem. seem there's many way can conversion. anyway following code works ok in big-endian system. how should write conversion function work on little-endian system well? this homework, since systems @ school running big-endian system. it's got curious , wanted make work on home computer also #include <iostream> #include <fstream> using namespace std; int main() { ifstream file; file.open("file.bin", ios::in | ios::binary); if(!file) cerr << "not able read" << endl; else { cout << "opened" << endl; int i_var; double d_var; while(!file.eof()) {...
Read more

C#: Application without a window or taskbar item (background app) that can still use Console.WriteLine() -

-
i'm trying create application adheres following: no taskbar no console or form window can utilize console.writeline() . (i.e. if executes app command prompt write console.) the problem if create windows form (or wpf) application can have there no taskbar, console or window show up, console.writeline() nothing. if create console app, writes console, can't figure out how hide (and if did hide it, write command prompt window?)... how do this? just create standard console application. callers responsibility hide window caused program (from how run c# console application console hidden ): system.diagnostics.processstartinfo start = new system.diagnostics.processstartinfo(); start.filename = dir + @"\myprocesstostart.exe"; start.windowstyle = system.diagnostics.processwindowstyle.hidden;
Read more