Pull (update your copy of) the repository when the homework is
assigned, and whenever the availability of an important update is
announced. A pull requires just one command when you have not
modified any files that are changed by the pull. If you have modified
such files, then three commands are needed. In either case start with
the commands:
[xyz.ece.lsu.edu]% cd ~/gp
[xyz.ece.lsu.edu]% git pull
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
From git://dmk.ece.lsu.edu/gp
a4c6dfd..dc9a031 master -> origin/master
Updating a4c6dfd..dc9a031
Fast-forward
vulkan/demo-01-simple.cc | 65 +++++++++++++---------------------------
1 files changed, 20 insertions(+), 45 deletions(-)
In the output above everything has gone smoothly. Your copy is
updated, in particular file demo-01-simple.cc has changed. Skip ahead to
the step Locate and read, below.
If your output looks like the one below (especially
the last two lines) then you've modified a file, demo-01-simple.cc
in the example below, that would be
changed by the pull. Follow the next step to fix the problem.
remote: Counting objects: 9, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 5 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (5/5), done.
From git://dmk.ece.lsu.edu/gp
dc9a031..a52f04e master -> origin/master
Updating dc9a031..a52f04e
error: Your local changes to vulkan/demo-01-simple.cc' would be overwritten by merge. Aborting.
Please, commit your changes or stash them before you can merge.