the work repository is a separate git base from the larger code base. When
you are in factor\work, git knows about your personal repository (assuming
you have one set up) but when you are in factor, it knows about where you
cloned from, but will ignore work as that's a personal distribution.
On
http://book.git-scm.com/3_basic_branching_and_merging.html
you can also do
1 git branch playing
2 git checkout playing
3 -- perform changes
4 git checkout master
-- you're back to level 2, but 3 is avail
How is 3 available? Is it version separately from the master you just
restored
the work repository is a separate git base from the larger code base.
I know. This is the result of the cloning.
When you are in factor\work, git knows about your personal repository
(assuming you have one set up) but when you are in factor, it knows about
where you cloned from, but will
On Sun, Nov 14, 2010 at 9:55 PM, Shaping shap...@charter.net wrote:
Right now I need to recover from a fetch origin.
You don't need to recover from a 'fetch'. What that does is it
downloads the stuff you don't yet have and stores it internally in a
'remote' branch. It makes no changes at all to
On Sun, Nov 14, 2010 at 10:01 PM, Shaping shap...@charter.net wrote:
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
There's a lot going on, so context is difficult here, but I was trying to go
back in time before you made changes, and suggest when working on Factor
main code, you make changes *in a branch,* sync with the larger community
in the main trunc, not a branch, then integrate your stuff by merging
There's a lot going on, so context is difficult here, but I was trying to go
back in time before you made changes, and suggest when working on Factor
main code, you make changes *in a branch,* sync
sync means to resolve conflicting changes? I am reading the Git
documentation from
You are managing interaction between three places, and I'm not great on
using the best words, so listen for the themes as I explain my working metal
model for git :) . A) The remote place, B) your local git version of that,
and C) your physical file layout. Commands like fetch work between A
Shaping shap...@charter.net wrote:
If you have a personal git host somewhere, and there are free ones, try
making two clones of the same little folder
I thought one clones only a repo.
Every working directory cloned from a repo is itself a repo. This is
why git is a decentralized and
: [Factor-talk] Furnace on Windows
Shaping shap...@charter.net wrote:
If you have a personal git host somewhere, and there are free ones, try
making two clones of the same little folder
I thought one clones only a repo.
Every working directory cloned from a repo is itself a repo
On Sun, Nov 14, 2010 at 2:45 PM, Shaping shap...@charter.net wrote:
There's a lot going on, so context is difficult here, but I was trying to
go back in time before you made changes, and suggest when working on Factor
main code, you make changes *in a branch,* sync
sync means to resolve
-Original Message-
From: William Tanksley, Jr [mailto:wtanksle...@gmail.com]
Sent: 2010-November-14, 17:42
To: factor-talk@lists.sourceforge.net
Subject: Re: [Factor-talk] Furnace on Windows
Shaping shap...@charter.net wrote:
If you have a personal git host somewhere
Thanks! I finally had time to figure out why it was failing for me -
concatenative.factor was assigning a port to secure.
: concatenative-website-server ( -- threaded-server )
http-server
factor-secure-config secure-config
8080 insecure
os winnt? [ 8431 secure ]
@lists.sourceforge.net
Subject: [Factor-talk] Furnace on Windows
Hi all,
I've fixed Furnace to work when SSL is not available, so it should
work on Windows now. Try this for example:
USE: websites.concatenative
init-testing
start-website
Then navigate to http://localhost:8080.
Slava
(in the original vocabs). I have not convince myself yet that Git
will keep old changes separate from those from the new update.
Shaping
From: Jim mack [mailto:j...@less2do.com]
Sent: 2010-November-14, 01:14
To: factor-talk@lists.sourceforge.net
Subject: Re: [Factor-talk] Furnace on Windows
On Sun, Nov 14, 2010 at 8:42 PM, Shaping shap...@charter.net wrote:
I have not convince myself yet that Git
will keep old changes separate from those from the new update.
I only know the command line so I'll give you command line tips and
you can translate them to equivalent GUI commands.
1)
On Sun, Nov 14, 2010 at 8:52 PM, Chris Double chris.dou...@double.co.nz wrote:
2) In this repository you make your own changes, including adding
stuff to the work directory, editing files, etc. Now you want to save
those in git so you can update safely.
git add work/my-new-vocab/*
git add
17 matches
Mail list logo
