Quick GitHub/CFWheels Question

[Impatus]

Hey,

Today I tried to fork a branch and pull a change I made. I had only
appended two lines, but github inferred that I was 'deleting 10 and
adding 12'. Meaning that I was deleting it all and re adding it with
my two lines.

Since I am new to github, can anyone help me out and or explain why
this happened? I think RIP rejected my pull because of this soft
error. Otherwise I think my suggestion was sound.

[tpet...@gmail.com]

sorry about that :)

what is probably happening is that you have autocrlf set to true. this
is the default when using git on windows. in order to be consistent
with linux and mac, we make sure that autocrlf is set to false.

depending on the client you're using, you it will be different,
however these are the instructions when dealing with it through the
command line

from within the your repository's directory see what autocrlf is set
to by doing:

git config --list

you should set the setting for it within the first couple of lines of
the output. it by chance it's set to true, you can set it to false by
doing the following:

git config core.autocrlf false

again the whole reason for this is because autocrlf is extremely evil
and causes nothing but headaches in the git community.

a simple check to see if you have the right autocrlf for a repo is to
simply open a file and add a line. next issue a diff by doing:

git diff --head

if you see that more then the single line was changed, chances are
your autocrlf is off for that repo.

[Mike Henke]

Bob has a good four part series about his experience on github and his
open source project. I would recommend anyone wanting to help Wheels
out read it.

http://www.silverwareconsulting.com/index.cfm/2010/9/13/A-Git-Workflow-for-Open-Source-Collaboration--Part-I--Introduction

Also there is a day training course on git this Friday, Feb 11th. It
is 200 bucks. https://github.com/training/online

[Impatus]

Thanks for taking the time to explain it, T and Mike for the
resources.

I have been coding for a few years, but in different places/ways.
CFWheels is the first open source project I have committed my time to
really helping out (both here on the forum [as you keep seeing my
name, and I yours] and within the code base). I want to get around to
that table aliasing soft bug that I brought up earlier and hope to get
it into a much larger release... my 'failure' here will only make me
try harder :] I have also been pushing CFWheels to other developers
recently and got at least two people hooked :]

So, let's do that ticket/project management piece. I want in!

On Feb 9, 5:02 pm, Mike Henke <henkem...@gmail.com> wrote:
> Bob has a good four part series about his experience on github and his
> open source project. I would recommend anyone wanting to help Wheels
> out read it.
>

> http://www.silverwareconsulting.com/index.cfm/2010/9/13/A-Git-Workflo...

>
> Also there is a day training course on git this Friday, Feb 11th. It

> is 200 bucks.https://github.com/training/online