Question: Should I create a new branch or keep working on the "faq" branch?

[ghost]

I want to work on more things and you've already pulled in my faq branch. Should I keep working on that one or make a new branch? Can I even delete the branch now?

[shipstar]

I think you've made more commits to the FAQ branch, right? We'll need to merge those in before you delete it.

Let's talk through this on Saturday and figure out a good workflow.

[shipstar]

For now, you can keep going on FAQ and we can get it merged in, then figure out the best way to move forward on Saturday.

On Thursday, February 13, 2014 at 10:28 AM, mathboy314 wrote:

@shipstar (https://github.com/shipstar) Yeah, because I wanted to do more work on it. Also I want to use jQuery on programs.html to show and hide the programs/projects with a "show" and "hide" button.

—
Reply to this email directly or view it on GitHub (#6 (comment)).

[ghost]

Closed

[ghost]

@shipstar What was the resistor book you had? My dad wants it...

[shipstar]

I bought https://www.sparkfun.com/products/10969.

On Monday, February 17, 2014 at 11:09 PM, mathboy314 wrote:

@shipstar (https://github.com/shipstar) What was the resistor book you had? My dad wants it...

—
Reply to this email directly or view it on GitHub (#6 (comment)).