git stash ========= $ wget http://gnuherds.org/gnuherds-online.tar.gz $ mv /var/www/gnuherds-app /var/www/gnuherds-app.my-backup $ mkdir /var/www/gnuherds-app $ cd /var/www/gnuherds-app /var/www/gnuherds-app$ tar xzvf /path-to/gnuherds-online.tar.gz See what is the initial state ############################# /var/www/gnuherds-app$ gitk & # gitk is very good to watch what is happing. Each time you execute a git command you can go to gitk menu File>Update and see what how the git log change or not. /var/www/gnuherds-app$ git stash list /var/www/gnuherds-app$ git stash show fatal: Needed a single revision /var/www/gnuherds-app$ git status # On branch master # Changed but not updated: # (use "git add ..." to update what will be committed) # # modified: Layer-0__Site_entry_point/templates/Charter_content.tpl # modified: Layer-0__Site_entry_point/templates/FAQ_content.tpl # modified: Layer-0__Site_entry_point/templates/FS_Job_Offers_form.tpl # modified: Layer-0__Site_entry_point/templates/View_Job_Offer_form.tpl # modified: Layer-0__Site_entry_point/templates/header.tpl # modified: Layer-0__Site_entry_point/templates/menu.tpl # modified: Layer-0__Site_entry_point/themes/red_Danijel/css/screen.css # modified: locale/de_DE/LC_MESSAGES/messages.po # modified: locale/es_ES/LC_MESSAGES/messages.po # modified: locale/fr_FR/LC_MESSAGES/messages.po # modified: locale/it_IT/LC_MESSAGES/messages.po # modified: locale/pt_PT/LC_MESSAGES/messages.po # modified: locale/ru_RU/LC_MESSAGES/messages.po # # Untracked files: # (use "git add ..." to include in what will be committed) # # Layer-0__Site_entry_point/FS_Pledges.php # Layer-0__Site_entry_point/FS_Volunteers.php ... no changes added to commit (use "git add" and/or "git commit -a") git-stash - Stash the changes in a dirty working directory away ############################################################### /var/www/gnuherds-app$ git stash /usr/bin/git-stash: line 40: /var/www/gnuherds-app/.git/logs/refs/stash: No such file or directory Saved "WIP on master: 5a6f0d3... comment fix" HEAD is now at 5a6f0d3... comment fix /var/www/gnuherds-app$ git stash list /var/www/gnuherds-app$ git stash show .../templates/Charter_content.tpl | 4 +- .../templates/FAQ_content.tpl | 2 + .../templates/FS_Job_Offers_form.tpl | 63 ++++++++++++++++--- .../templates/View_Job_Offer_form.tpl | 2 +- Layer-0__Site_entry_point/templates/header.tpl | 4 +- Layer-0__Site_entry_point/templates/menu.tpl | 18 +++++- .../themes/red_Danijel/css/screen.css | 2 +- locale/de_DE/LC_MESSAGES/messages.po | 4 +- locale/es_ES/LC_MESSAGES/messages.po | 4 +- locale/fr_FR/LC_MESSAGES/messages.po | 4 +- locale/it_IT/LC_MESSAGES/messages.po | 4 +- locale/pt_PT/LC_MESSAGES/messages.po | 4 +- locale/ru_RU/LC_MESSAGES/messages.po | 4 +- 13 files changed, 90 insertions(+), 29 deletions(-) Update the local Git repository with the new changes committed by other developers to http://git.savannah.gnu.org/gitweb/?p=gnuherds-app.git ##################################################################################### /var/www/gnuherds-app$ git pull remote: Counting objects: 195, done. remote: Compressing objects: 100% (135/135), done. Indexing 151 objects... remote: Total 151 (delta 98), reused 0 (delta 0) 100% (151/151) done Resolving 98 deltas... 100% (98/98) done 29 objects were added to complete this thin pack. * refs/heads/origin: fast forward to branch 'master' of git://git.savannah.nongnu.org/gnuherds-app old..new: 5a6f0d3..c2d1f4f Updating 5a6f0d3..c2d1f4f fatal: Untracked working tree file 'Layer-0__Site_entry_point/themes/red_Danijel/images/agplv3-155x51.png' would be overwritten by merge. # It seems to be needed move this file to solve the above issue. /var/www/gnuherds-app$ mv Layer-0__Site_entry_point/themes/red_Danijel/images/agplv3-155x51.png Layer-0__Site_entry_point/themes/red_Danijel/images/agplv3-155x51.png.tmp # Not "git pull" works rightly. It download the new changes committed by other developers to http://git.savannah.gnu.org/gitweb/?p=gnuherds-app.git /var/www/gnuherds-app$ git pull Updating 5a6f0d3..c2d1f4f Fast forward Layer-0__Site_entry_point/Company.php | 4 +- Layer-0__Site_entry_point/Lost_Password.php | 4 +- Layer-0__Site_entry_point/Person.php | 4 +- .../doc/GNUHerds__SQL_Implementation.sql | 2 +- .../doc/conf/apache_virtual_domain.conf | 110 +++++++++++++++++++- .../doc/dev/agpl-logo-source/agplv3-155x51.xcf | Bin 0 -> 6311 bytes .../doc/dev/agpl-logo-source/agplv3.svg.bz2 | Bin 0 -> 46482 bytes .../Neuropolitical.TTF | Bin 47472 -> 47472 bytes .../{logo-source => gnuherds-logo-source}/logo.xcf | Bin 16901 -> 16901 bytes .../logo_red-theme.xcf | Bin 22792 -> 22792 bytes Layer-0__Site_entry_point/images/agplv3-155x51.png | Bin 5715 -> 0 bytes .../non-profit_Organization.php | 4 +- .../templates/Charter_content.tpl | 4 +- .../templates/FAQ_content.tpl | 12 -- Layer-0__Site_entry_point/templates/header.tpl | 4 +- .../themes/green_Davi/css/screen.css | 6 +- .../themes/green_Davi/images/agplv3-155x51.png | Bin 0 -> 3541 bytes .../themes/red_Danijel/css/screen.css | 6 +- .../themes/red_Danijel/images/agplv3-155x51.png | Bin 0 -> 3541 bytes .../forms/Manage_Job_Offer_Applications_form.php | 1 - .../content/forms/Qualifications_form.php | 2 - .../content/forms/View_Qualifications_form.php | 2 - Layer-5__DB_operation/Job_Offer.php | 1 - Layer-5__DB_operation/Qualifications.php | 20 ++-- locale/de_DE/LC_MESSAGES/messages.po | 8 +- locale/es_ES/LC_MESSAGES/messages.po | 7 +- locale/fr_FR/LC_MESSAGES/messages.po | 8 +- locale/it_IT/LC_MESSAGES/messages.po | 7 +- locale/pt_PT/LC_MESSAGES/messages.po | 7 +- locale/ru_RU/LC_MESSAGES/messages.po | 7 +- 30 files changed, 153 insertions(+), 77 deletions(-) create mode 100644 Layer-0__Site_entry_point/doc/dev/agpl-logo-source/agplv3-155x51.xcf create mode 100644 Layer-0__Site_entry_point/doc/dev/agpl-logo-source/agplv3.svg.bz2 rename Layer-0__Site_entry_point/doc/dev/{logo-source => gnuherds-logo-source}/Neuropolitical.TTF (100%) rename Layer-0__Site_entry_point/doc/dev/{logo-source => gnuherds-logo-source}/logo.xcf (100%) rename Layer-0__Site_entry_point/doc/dev/{logo-source => gnuherds-logo-source}/logo_red-theme.xcf (100%) delete mode 100644 Layer-0__Site_entry_point/images/agplv3-155x51.png create mode 100644 Layer-0__Site_entry_point/themes/green_Davi/images/agplv3-155x51.png create mode 100644 Layer-0__Site_entry_point/themes/red_Danijel/images/agplv3-155x51.png # Check that we are up-to-date: /var/www/gnuherds-app$ git pull Already up-to-date. Check the 'stash' state ####################### /var/www/gnuherds-app$ git stash list /var/www/gnuherds-app$ git stash show .../templates/Charter_content.tpl | 4 +- .../templates/FAQ_content.tpl | 2 + .../templates/FS_Job_Offers_form.tpl | 63 ++++++++++++++++--- .../templates/View_Job_Offer_form.tpl | 2 +- Layer-0__Site_entry_point/templates/header.tpl | 4 +- Layer-0__Site_entry_point/templates/menu.tpl | 18 +++++- .../themes/red_Danijel/css/screen.css | 2 +- locale/de_DE/LC_MESSAGES/messages.po | 4 +- locale/es_ES/LC_MESSAGES/messages.po | 4 +- locale/fr_FR/LC_MESSAGES/messages.po | 4 +- locale/it_IT/LC_MESSAGES/messages.po | 4 +- locale/pt_PT/LC_MESSAGES/messages.po | 4 +- locale/ru_RU/LC_MESSAGES/messages.po | 4 +- 13 files changed, 90 insertions(+), 29 deletions(-) Check the state of the loca Git repository ########################################## /var/www/gnuherds-app$ git status # On branch master # Untracked files: # (use "git add ..." to include in what will be committed) # # Layer-0__Site_entry_point/FS_Pledges.php # Layer-0__Site_entry_point/FS_Volunteers.php ... nothing added to commit but untracked files present (use "git add" to track) /var/www/gnuherds-app$ git stash apply Auto-merged Layer-0__Site_entry_point/templates/FAQ_content.tpl CONFLICT (content): Merge conflict in Layer-0__Site_entry_point/templates/FAQ_content.tpl Auto-merged Layer-0__Site_entry_point/templates/header.tpl CONFLICT (content): Merge conflict in Layer-0__Site_entry_point/templates/header.tpl Auto-merged Layer-0__Site_entry_point/themes/red_Danijel/css/screen.css CONFLICT (content): Merge conflict in Layer-0__Site_entry_point/themes/red_Danijel/css/screen.css Auto-merged locale/de_DE/LC_MESSAGES/messages.po Auto-merged locale/es_ES/LC_MESSAGES/messages.po Auto-merged locale/fr_FR/LC_MESSAGES/messages.po Auto-merged locale/it_IT/LC_MESSAGES/messages.po Auto-merged locale/pt_PT/LC_MESSAGES/messages.po Auto-merged locale/ru_RU/LC_MESSAGES/messages.po # We see how 3 files had comflicts and were not merged automatically. We edit such files and look for "====" string to locate the conflict and solve it. I do not know if you know how to solve merge conflict... Let me know if you need help. /var/www/gnuherds-app$ vi Layer-0__Site_entry_point/templates/FAQ_content.tpl /var/www/gnuherds-app$ vi Layer-0__Site_entry_point/templates/header.tpl /var/www/gnuherds-app$ vi Layer-0__Site_entry_point/themes/red_Danijel/css/screen.css # We see that the above files are at "unmerged" state: /var/www/gnuherds-app$ git status # On branch master # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: Layer-0__Site_entry_point/templates/FS_Job_Offers_form.tpl # modified: Layer-0__Site_entry_point/templates/View_Job_Offer_form.tpl # modified: Layer-0__Site_entry_point/templates/menu.tpl # # Changed but not updated: # (use "git add ..." to update what will be committed) # # unmerged: Layer-0__Site_entry_point/templates/FAQ_content.tpl # modified: Layer-0__Site_entry_point/templates/FAQ_content.tpl # unmerged: Layer-0__Site_entry_point/templates/header.tpl # modified: Layer-0__Site_entry_point/templates/header.tpl # unmerged: Layer-0__Site_entry_point/themes/red_Danijel/css/screen.css # modified: Layer-0__Site_entry_point/themes/red_Danijel/css/screen.css # # Untracked files: # (use "git add ..." to include in what will be committed) # # Layer-0__Site_entry_point/FS_Pledges.php # Layer-0__Site_entry_point/FS_Volunteers.php ... /var/www/gnuherds-app$ # After we have edited the files, we execute the "git add" command to fix such "unmerged state": /var/www/gnuherds-app$ git add Layer-0__Site_entry_point/templates/FAQ_content.tpl /var/www/gnuherds-app$ git add Layer-0__Site_entry_point/templates/header.tpl /var/www/gnuherds-app$ git add Layer-0__Site_entry_point/themes/red_Danijel/css/screen.css # We check that we have our Git local repository an up-to-date, and with our personal changes ready to be improved, committed, etc.: /var/www/gnuherds-app$ git pull Already up-to-date. /var/www/gnuherds-app$ git status # On branch master # Changes to be committed: # (use "git reset HEAD ..." to unstage) # # modified: Layer-0__Site_entry_point/templates/FS_Job_Offers_form.tpl # modified: Layer-0__Site_entry_point/templates/View_Job_Offer_form.tpl # modified: Layer-0__Site_entry_point/templates/header.tpl # modified: Layer-0__Site_entry_point/templates/menu.tpl # # Untracked files: # (use "git add ..." to include in what will be committed) # # Layer-0__Site_entry_point/FS_Pledges.php # Layer-0__Site_entry_point/FS_Volunteers.php # Layer-0__Site_entry_point/index.php # Layer-0__Site_entry_point/templates/FS_Pledges_form.tpl ... /var/www/gnuherds-app$