<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
<meta name=Generator content="Microsoft Word 11 (filtered medium)">
<!--[if !mso]>
<style>
v\:* {behavior:url(#default#VML);}
o\:* {behavior:url(#default#VML);}
w\:* {behavior:url(#default#VML);}
.shape {behavior:url(#default#VML);}
</style>
<![endif]-->
<style>
<!--
/* Font Definitions */
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman";}
a:link, span.MsoHyperlink
{color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{color:purple;
text-decoration:underline;}
p
{margin:0in;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman";}
span.EmailStyle19
{mso-style-type:personal-reply;
font-family:Arial;
color:navy;}
@page Section1
{size:8.5in 11.0in;
margin:1.0in 1.0in .5in 1.0in;}
div.Section1
{page:Section1;}
-->
</style>
</head>
<body lang=EN-US link=blue vlink=purple>
<div class=Section1>
<p class=MsoNormal><font size=2 color=navy face=Arial><span style='font-size:
10.0pt;font-family:Arial;color:navy'>I’m working on getting your camp29
back in sync. Is your version of catalogs/nbp/templates/regions/HEAD_P the most
current version? Also, I did a “git checkout – filename” for
homepage.html, index.html, and main_font.css to get back in sync with the
master. I made copies of these files, so if you want to retain the then I’ll
copy them back and commit them. <o:p></o:p></span></font></p>
<p class=MsoNormal><font size=2 color=navy face=Arial><span style='font-size:
10.0pt;font-family:Arial;color:navy'><o:p> </o:p></span></font></p>
<div>
<div class=MsoNormal align=center style='text-align:center'><font size=3
face="Times New Roman"><span style='font-size:12.0pt'>
<hr size=2 width="100%" align=center tabindex=-1>
</span></font></div>
<p class=MsoNormal><b><font size=2 face=Tahoma><span style='font-size:10.0pt;
font-family:Tahoma;font-weight:bold'>From:</span></font></b><font size=2
face=Tahoma><span style='font-size:10.0pt;font-family:Tahoma'>
web-reskin-bounces@nbp.org [mailto:web-reskin-bounces@nbp.org] <b><span
style='font-weight:bold'>On Behalf Of </span></b>swdidomenico@comcast.net<br>
<b><span style='font-weight:bold'>Sent:</span></b> Thursday, November 05, 2009
8:06 AM<br>
<b><span style='font-weight:bold'>To:</span></b> Web-reskin@nbp.org<br>
<b><span style='font-weight:bold'>Subject:</span></b> [NBP web-reskin] Camp29
git error</span></font><o:p></o:p></p>
</div>
<p class=MsoNormal><font size=3 face="Times New Roman"><span style='font-size:
12.0pt'><o:p> </o:p></span></font></p>
<div>
<div>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'>I added page <strong><b><font face=Arial><span
style='font-family:Arial'>site.html, commited it, </span></font></b></strong>and
did a git push.<o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'> <o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'>I got an error duing the git push. Is
there a way to check to see if site.html is in the "Master" camp?<o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'> <o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'>As you can see below that at one time site.html
was listed in my git status. Now my git status does not show up in a git
status.<o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'> <o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'>I also did a git pull to see if that would fix
the problem. It did not. I also restarted Interchange and that did not help either.
Does the Camp have to be recycled?<o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'> <o:p></o:p></span></font></p>
<p><strong><b><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'>Here is the error:</span></font></b></strong><font
color=black face=Arial><span style='font-family:Arial;color:black'><o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'><br>
[fidelity_camp@tp6 pages]$ git push<br>
To /home/camp/reskin/nbp.git<br>
! [rejected] master ->
master (non-fast forward)<br>
error: failed to push some refs to '/home/camp/reskin/nbp.git'<o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'> <o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'> <o:p></o:p></span></font></p>
<p><strong><b><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'>Here is a log of activity:</span></font></b></strong><font
color=black face=Arial><span style='font-family:Arial;color:black'><o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'> <o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'>camp26 camp28 camp29
camp30 camp31 productionfiles tmp<br>
[fidelity_camp@tp6 ~]$ cd camp29<br>
[fidelity_camp@tp6 camp29]$ dir<br>
bin catalogs cgi-bin htdocs httpd
interchange pgsql tmp<br>
[fidelity_camp@tp6 camp29]$ cd catalogs<br>
[fidelity_camp@tp6 catalogs]$ dir<br>
nbp<br>
[fidelity_camp@tp6 catalogs]$ cd nbp<br>
[fidelity_camp@tp6 nbp]$ dir<br>
catalog.cfg estimate_uploads
logs
schema special_pages<br>
catalog_local.cfg
etc
nbp.structure scripts templates<br>
custom
images
orders
session tmp<br>
elist
include
pages sitemap.xml<br>
error.log
jobs
products soft_goods<br>
[fidelity_camp@tp6 nbp]$ cd pages<br>
[fidelity_camp@tp6 pages]$ dir<br>
account.html
homepage.htm
production<br>
admin
homepage.html
publications<br>
affiliate
index_ascent_color.html publications_ascent.html<br>
all_products.html
index_ascent.html query<br>
alphabet.jpg
index-handson.html readbooks<br>
braille
index-highlights.html SCW-1YR.html<br>
buzzard.html
index.html
SCW-2YR.html<br>
cart.html
index_new.html
set-volatile.html<br>
cbbc
index_old.html
ship_check.html<br>
change_email.html index_template_test.html
site.html<br>
change_password.html
index.twav.html
sitemap.html<br>
checkout
login.html
sitemap_new.html<br>
clear-session.html
logo.jpg
sitemap.xml<br>
company
logout.html
site_search_results.html<br>
contact_thanks.html
lost_password.html
soft_goods_download.html<br>
customerservice.html
louis
special_dump.html<br>
customize.html
mydownloads.html
StylesNew.css<br>
dump.html
nagios.html
support<br>
education
new_account.html
t-alt.html<br>
example.html
new-raff.html
tour<br>
find.html
OS.html
twav.html<br>
flypage.html
our_president.html video.jpg<br>
flypage_textbook.html
pic1.jpg
with_twav.html<br>
[fidelity_camp@tp6 pages]$ dir site.html<br>
site.html<br>
[fidelity_camp@tp6 pages]$ git add site.html<br>
<strong><b><font face=Arial><span style='font-family:Arial'>[fidelity_camp@tp6
pages]$ git status</span></font></b></strong><br>
# On branch master<br>
# Changes to be committed:<br>
# (use "git reset HEAD <file>..." to unstage)<br>
#<br>
<strong><b><font face=Arial><span style='font-family:Arial'>#
new file: site.html</span></font></b></strong><br>
#<br>
# Changed but not updated:<br>
# (use "git add <file>..." to update what will be committed)<br>
# (use "git checkout -- <file>..." to discard
changes in working directory)<br>
#<br>
# modified: homepage.html<br>
# modified: index.html<br>
# modified:
../../../htdocs/nbp/main_font.css<br>
#<br>
# Untracked files:<br>
# (use "git add <file>..." to include in what will
be committed)<br>
#<br>
# index_new.html<br>
# index_old.html<br>
# index_template_test.html<br>
# ../templates/regions/FOOT_P<br>
# ../templates/regions/HEAD_P<br>
# ../templates/regions/MENU_P<br>
# ../templates/regions/STEVE_TEMPLATE<br>
# ../templates/regions/TITLE<br>
# ../templates/regions/TOP_P<br>
[fidelity_camp@tp6 pages]$ cd..<br>
-bash: cd..: command not found<br>
[fidelity_camp@tp6 pages]$ cd\<br>
> dir<br>
-bash: cddir: command not found<br>
[fidelity_camp@tp6 pages]$ cd.<br>
-bash: cd.: command not found<br>
[fidelity_camp@tp6 pages]$ cd..<br>
-bash: cd..: command not found<br>
[fidelity_camp@tp6 pages]$ dir<br>
account.html
homepage.htm
production<br>
admin
homepage.html
publications<br>
affiliate
index_ascent_color.html publications_ascent.html<br>
all_products.html
index_ascent.html query<br>
alphabet.jpg
index-handson.html readbooks<br>
braille
index-highlights.html SCW-1YR.html<br>
buzzard.html
index.html
SCW-2YR.html<br>
cart.html
index_new.html
set-volatile.html<br>
cbbc
index_old.html
ship_check.html<br>
change_email.html index_template_test.html
site.html<br>
change_password.html index.twav.html
sitemap.html<br>
checkout
login.html
sitemap_new.html<br>
clear-session.html
logo.jpg
sitemap.xml<br>
company
logout.html
site_search_results.html<br>
contact_thanks.html
lost_password.html
soft_goods_download.html<br>
customerservice.html
louis
special_dump.html<br>
customize.html
mydownloads.html
StylesNew.css<br>
dump.html
nagios.html
support<br>
education
new_account.html
t-alt.html<br>
example.html
new-raff.html
tour<br>
find.html
OS.html
twav.html<br>
flypage.html
our_president.html video.jpg<br>
flypage_textbook.html pic1.jpg
with_twav.html<br>
[fidelity_camp@tp6 pages]$ git commit<br>
[master 573648f] Steve DiDomenico - adding new page site.html<br>
1 files changed, 9 insertions(+), 0 deletions(-)<br>
create mode 100644 catalogs/nbp/pages/site.html<br>
[fidelity_camp@tp6 pages]$ git push --dry --run<br>
error: unknown option `run'<br>
usage: git push [--all | --mirror] [--dry-run] [--tags]
[--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f |
--force] [-v] [<repository> <refspec>...]<o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'> -v,
--verbose be verbose<br>
--repo <repository> repository<br>
--all
push all refs<br>
--mirror
mirror all refs<br>
--tags
push tags<br>
--dry-run
dry run<br>
-f,
--force force
updates<br>
--thin
use thin pack<br>
--receive-pack <receive-pack><br>
receive pack program<br>
--exec <receive-pack><br>
receive pack program<o:p></o:p></span></font></p>
<p><font size=3 color=black face=Arial><span style='font-size:12.0pt;
font-family:Arial;color:black'>[fidelity_camp@tp6 pages]$ git push --dry-run<br>
To /home/camp/reskin/nbp.git<br>
! [rejected] master ->
master (non-fast forward)<br>
error: failed to push some refs to '/home/camp/reskin/nbp.git'<br>
[fidelity_camp@tp6 pages]$ git push<br>
To /home/camp/reskin/nbp.git<br>
! [rejected] master ->
master (non-fast forward)<br>
error: failed to push some refs to '/home/camp/reskin/nbp.git'<br>
[fidelity_camp@tp6 pages]$ git status<br>
# On branch master<br>
# Your branch is ahead of 'origin/master' by 1 commit.<br>
#<br>
# Changed but not updated:<br>
# (use "git add <file>..." to update what will be
committed)<br>
# (use "git checkout -- <file>..." to discard
changes in working directory)<br>
#<br>
# modified: homepage.html<br>
# modified: index.html<br>
# modified:
../../../htdocs/nbp/main_font.css<br>
#<br>
# Untracked files:<br>
# (use "git add <file>..." to include in what will
be committed)<br>
#<br>
# index_new.html<br>
# index_old.html<br>
# index_template_test.html<br>
# ../templates/regions/FOOT_P<br>
# ../templates/regions/HEAD_P<br>
# ../templates/regions/MENU_P<br>
# ../templates/regions/STEVE_TEMPLATE<br>
# ../templates/regions/TITLE<br>
# ../templates/regions/TOP_P<br>
no changes added to commit (use "git add" and/or "git commit
-a")<br>
[fidelity_camp@tp6 pages]$ git -push<br>
Unknown option: -push<br>
usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate|--no-pager]
[--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND
[ARGS]<br>
[fidelity_camp@tp6 pages]$ git push<br>
To /home/camp/reskin/nbp.git<br>
! [rejected] master ->
master (non-fast forward)<br>
error: failed to push some refs to '/home/camp/reskin/nbp.git'<br>
[fidelity_camp@tp6 pages]$ [fidelity_camp@tp6 pages]$ git push<br>
-bash: [fidelity_camp@tp6: command not found<br>
[fidelity_camp@tp6 pages]$ To /home/camp/reskin/nbp.git<br>
-bash: To: command not found<br>
[fidelity_camp@tp6 pages]$ !
[rejected] master -> master
(non-fast forward)<br>
-bash: syntax error near unexpected token `('<br>
[fidelity_camp@tp6 pages]$ error: failed to push some refs to
'/home/camp/reskin/nbp.git'<br>
-bash: error:: command not found<br>
[fidelity_camp@tp6 pages]$ [fidelity_camp@tp6 pages]$<br>
-bash: [fidelity_camp@tp6: command not found<br>
[fidelity_camp@tp6 pages]$ git push<br>
To /home/camp/reskin/nbp.git<br>
! [rejected] master ->
master (non-fast forward)<br>
error: failed to push some refs to '/home/camp/reskin/nbp.git'<br>
[fidelity_camp@tp6 pages]$ git pull<br>
remote: Counting objects: 253, done.<br>
remote: Compressing objects: 100% (212/212), done.<br>
remote: Total 233 (delta 130), reused 0 (delta 0)<br>
Receiving objects: 100% (233/233), 19.94 MiB | 2373 KiB/s, done.<br>
Resolving deltas: 100% (130/130), completed with 18 local objects.<br>
>From /home/camp/reskin/nbp<br>
c279408..c6f4934 master ->
origin/master<br>
error: Entry 'catalogs/nbp/pages/homepage.html' not uptodate. Cannot merge.<br>
fatal: merging of trees eba9bdf174ca724b91bfe6977f00be450b5a2afa and
d3802e42978a78bc3de7f6a4c892a4b20fd81dec failed<br>
[fidelity_camp@tp6 pages]$ git status<br>
# On branch master<br>
# Your branch and 'origin/master' have diverged,<br>
# and have 1 and 22 different commit(s) each, respectively.<br>
#<br>
# Changed but not updated:<br>
# (use "git add <file>..." to update what will be
committed)<br>
# (use "git checkout -- <file>..." to discard
changes in working directory)<br>
#<br>
# modified: homepage.html<br>
# modified: index.html<br>
# modified:
../../../htdocs/nbp/main_font.css<br>
#<br>
# Untracked files:<br>
# (use "git add <file>..." to include in what will
be committed)<br>
#<br>
# index_new.html<br>
# index_old.html<br>
# index_template_test.html<br>
# ../templates/regions/FOOT_P<br>
# ../templates/regions/HEAD_P<br>
# ../templates/regions/MENU_P<br>
# ../templates/regions/STEVE_TEMPLATE<br>
# ../templates/regions/TITLE<br>
# ../templates/regions/TOP_P<br>
no changes added to commit (use "git add" and/or "git commit
-a")<br>
[fidelity_camp@tp6 pages]$ git push<br>
To /home/camp/reskin/nbp.git<br>
! [rejected] master ->
master (non-fast forward)<br>
error: failed to push some refs to '/home/camp/reskin/nbp.git'<br>
[fidelity_camp@tp6 pages]$<o:p></o:p></span></font></p>
</div>
</div>
</div>
</body>
</html>