<p>Well, either add and commit the changes to the images, or checkout the old versions. Either way will put git back in a state where it is willing to push, pull, and merge.</p>
<p><blockquote type="cite">On Aug 5, 2010 1:02 PM, "Jens Axel Søgaard" <<a href="mailto:jensaxel@soegaard.net">jensaxel@soegaard.net</a>> wrote:<br><br>2010/8/5 Carl Eastlund <<a href="mailto:cce@ccs.neu.edu">cce@ccs.neu.edu</a>>:<br>
<p><font color="#500050">> What does "git status" currently tell you?<br></font></p>See below.<br>
<br>
It seems the images in<br>
<br>
collects/teachpack/2htdp/scribblings/img/<br>
<br>
are tracked by git, which means that they are not generated<br>
automatically (I thought they were).<br>
<br>
I am still a little unsure how to proceed. Any advice?<br>
<br>
/Jens Axel<br>
<br>
80:plt soegaard$ /usr/local/git/bin/git status<br>
# On branch master<br>
# Your branch and 'origin/master' have diverged,<br>
# and have 2 and 11 different commit(s) each, respectively.<br>
#<br>
# Changes to be committed:<br>
# (use "git reset HEAD <file>..." to unstage)<br>
#<br>
# new file: collects/teachpack/triangle-xxx.png<br>
#<br>
# Changed but not updated:<br>
# (use "git add/rm <file>..." to update what will be committed)<br>
# (use "git checkout -- <file>..." to discard changes in working directory)<br>
#<br>
# modified: collects/teachpack/2htdp/scribblings/image-toc.rkt<br>
# deleted: collects/teachpack/2htdp/scribblings/img/2353974cf1b.png<br>
# deleted: collects/teachpack/2htdp/scribblings/img/24b86203f5.png<br>
# deleted: collects/teachpack/2htdp/scribblings/img/2751bdfe579.png<br>
# deleted: collects/teachpack/2htdp/scribblings/img/2a03b18c0c.png<br>
# deleted: collects/teachpack/2htdp/scribblings/img/2bed4c99df8.png<br>
# deleted: collects/teachpack/2htdp/scribblings/img/2c15acb26ba.png<br>
# deleted: collects/teachpack/2htdp/scribblings/img/2c93aecb2b5.png<br>
# deleted: collects/teachpack/2htdp/scribblings/img/2c98838ff0.png<br>
# deleted: collects/teachpack/2htdp/scribblings/img/8aebbc110e.png<br>
# deleted: collects/teachpack/2htdp/scribblings/img/f488ae4f9e.png<br>
#<br>
# Untracked files:<br>
# (use "git add <file>..." to include in what will be committed)<br>
#<br>
# collects/teachpack/2htdp/scribblings/image.html<br>
# collects/teachpack/2htdp/scribblings/img/11f41037210.png<br>
# collects/teachpack/2htdp/scribblings/img/16c877168cb.png<br>
# collects/teachpack/2htdp/scribblings/img/185481b843d.png<br>
# collects/teachpack/2htdp/scribblings/img/1aea72997cc.png<br>
# collects/teachpack/2htdp/scribblings/img/1c2ca686e5c.png<br>
# collects/teachpack/2htdp/scribblings/img/1ce2f057282.png<br>
# collects/teachpack/2htdp/scribblings/img/206013002a2.png<br>
# collects/teachpack/2htdp/scribblings/img/2271196b15b.png<br>
# collects/teachpack/2htdp/scribblings/img/22fbf40600e.png<br>
# collects/teachpack/2htdp/scribblings/img/28083dbe539.png<br>
# collects/teachpack/2htdp/scribblings/img/28fbf34134c.png<br>
# collects/teachpack/2htdp/scribblings/img/292cf6346d5.png<br>
# collects/teachpack/2htdp/scribblings/img/2a3953f3712.png<br>
# collects/teachpack/2htdp/scribblings/img/2a876662e0e.png<br>
# collects/teachpack/2htdp/scribblings/img/2d67c4219ef.png<br>
# collects/teachpack/2htdp/scribblings/img/3a33de5a32.png<br>
# collects/teachpack/2htdp/scribblings/img/3c0f55df6a.png<br>
# collects/teachpack/2htdp/scribblings/img/6f8f1b6543.png<br>
# collects/teachpack/2htdp/scribblings/img/e2d39b3ee5.png<br>
# collects/teachpack/2htdp/scribblings/img/e2d39b92b5.png<br>
# collects/teachpack/2htdp/scribblings/img/eb983f1874.png<br>
# collects/teachpack/2htdp/scribblings/racket.css<br>
# collects/teachpack/2htdp/scribblings/scribble-common.js<br>
# collects/teachpack/2htdp/scribblings/scribble-style.css<br>
# collects/teachpack/2htdp/scribblings/scribble.css<br>
<br>
</blockquote></p>