> I know. I'm concerned about possible collisions with modified stock code.
> I think the point Chris is making in his step 2 is that these changes need
> to be committed, first, but he did not mention old directories , only new
> ones.
'git add' is used to tell git about new files you have created.
That is the movement of files from the upper Staged Changes pane to the
lower Unstaged Changes (Will Commit) pane.
The
command to commit with the '-a' switch tells git to include all
changes in existing files as well as those you've added manually. This
is why I used:
git commit -a -m "My message"
This commit is what you do with button next to the lower pane. At this time
you add your comments.
I strongly suggest created a test clone of the factor repository and
playing around with git commands in this 'safe to destroy' clone while
working through a git tutorial.
That would involve making a new clone upon start-up of Git GUI.
Was my statement about the need to commit correct? This commit creates a
delta model retained by Git GUI (not in the repo working directory).
Without the commit, you could easily overwrite code, if the updated code
includes changes to the same file you changed locally? Or is the code in
conflict always marked? If this happened then you would need to merge
anyway. I assume that to do a merge you will want a fresh update held
locally and your changed code held locally, so that if the merge fails, you
can roll back and try again.
...
I tried moving my changed files to the Staged Changes (Will Commit) pane,
and got this error:
"Updating the Git index failed. A rescan will be automatically started to
resynchronize git-gui.
warning: LF will be replaced by CRLF in extra/tetris/deploy.factor.
The file will have its original line endings in your working directory."
Not sure why this happened. Is this just automatic clean-up of
line-terminators? I have done nothing with this repo but poke around
looking at things. The only change I've made is the recent fetch origin.
I'm not sure what the Unlock Index and Continue choices refer to.
Shaping
----------------------------------------------------------------------------
--
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Factor-talk mailing list
Factor-talk@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/factor-talk
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Factor-talk mailing list
Factor-talk@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/factor-talk
