[Fluxus] a bit lost in Git

[Kassen]

Dear list,

I have a bit of trouble with Git.

I made a branch (only local now, I think) called "redacted" for my fluxa
experiments. In this I made a "ramp" which takes 2 values and a time, then
ramps from value A to value B over this time (basically; I now have TB303
"slides").

This I was hoping to commit and push so others could try it yet it would
-hopefully- not immediately go into the master branch. (ramp ) is relatively
harmless and I thought I'd try this on that before I try more elaborate
experiments.

Now in the meantime Gabor (I think) made some new stuff and the helpmap got
updated and is now out of sync with mine. Git wants me to "merge", but last
time I tried that function it showed up with big red letters on our savannah
page. I think that one should be harmless, but it looks scary.

Could somebody please tell me what to do so I can't break anything and the
master branch is more or less safe from my experiments? Essentially I want
"redacted" to have everything that Dave does in addition to my own
experiments, Dave could then cherry-pick the bits from my work that he likes
and theoretically people that like to live dangerously could try my branch.

Yours,
Kas.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.pawfal.org/pipermail/fluxus-pawfal.org/attachments/20110328/09e3ffc4/attachment-0002.htm>