search

gatorbotics1700 / Robot-2016

Code for 2016 Stronghold robot.
http://gatorbotics.org/
1 stars 2 forks source link

Killing binary files #1

Closed doubletissue closed 8 years ago

doubletissue commented 8 years ago

This is how you are supposed to do git. Instead of each person editing files willy nilly, they edit their own copy of everything and create a "pull request", which must be approved before it is integrated. It allows for discussion of what the changes will do and checking to make sure everything looks good before it goes live.

doubletissue commented 8 years ago

Anyways, it looks like Christine added back the /bin/ directory, which will cause headaches. This will nip it in the bud.

doubletissue commented 8 years ago

Oh, and you can even comment on specific lines in text files! It doesn't work for this because the files I'm editing are all binaries.

christinecho commented 8 years ago

​sorry?​

On Wed, Feb 3, 2016 at 10:05 AM, origamize notifications@github.com wrote:

Oh, and you can even comment on specific lines in text files! It doesn't work for this because the files I'm editing are all binaries.

— Reply to this email directly or view it on GitHub https://github.com/gatorbotics1700/Robot-2016/pull/1#issuecomment-179379921 .

Christine Cho Class of 2017

doubletissue commented 8 years ago

No problem! Emily added a bunch of crap too. I removed them all and added a .gitignore file so they won't get added again.

doubletissue commented 8 years ago

Before either of you do anything else, hit the big green "merge pull request" button.

christinecho commented 8 years ago

Ok, thanks so much for doing that! I'll make sure to hit the merge pull request button. Thanks!

On Wed, Feb 3, 2016 at 1:49 PM, origamize notifications@github.com wrote:

Before either of you do anything else, hit the big green "merge pull request" button.

— Reply to this email directly or view it on GitHub https://github.com/gatorbotics1700/Robot-2016/pull/1#issuecomment-179488067 .

Christine Cho Class of 2017