Thread (11 messages) flat view 11 messages, 5 authors, 2016-06-15

Re: My first git success

From: Randal L. Schwartz <hidden>
Date: 2016-06-15 22:42:16

quoted
quoted
quoted
quoted
"Linus" == Linus Torvalds [off-list ref] writes:
Linus> I still hope the exchanges will result in more docs, or at least other 
Linus> lurkers on the list also learning a new trick or two..

I've also enjoyed a bit of success putting a website under git.  I started
working on AJAX-ing some of the code, but I needed to do maintainence on the
live site, so I've just simply done "git-checkout master" to work on that, and
"git-checkout ajax; git-pull . master" when I want to continue work on the
ajax upgrades.

However, before I bug-fix, I have to "snapshot" any working changes in the
ajax branch or I would lose them on "git-checkout master", which gives me
commits that look like "snapshot".  Am I doing that wrong?  Is there a better
way to do parallel development of a "live vs upgrade" branch, and make commits
only when I make progress?

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
[off-list ref] <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help