Closed michaelsilver closed 9 years ago
Alright. To be honest I don't remember ever doing that because it was so long ago. I will keep this in mind in the future.
If you were waiting on my OK to merge, than you can do that now. I don't plan on modifying the code in this repo any further.
On Mon, Nov 2, 2015 at 11:06 PM, Michael Silver notifications@github.com wrote:
@PaulTerrasi https://github.com/PaulTerrasi, please never ever ever ever ever ever ever ever ever again use git add -f. In fact, please re-clone the repo if you ever want to push changes, so you don't add back the stuff I removed. FYI, the right way to git add is git add ., not -f
since that overrides the .gitignore.
You can view, comment on, or merge this pull request online at:
https://github.com/246overclocked/scorpion/pull/3 Commit Summary
- removed unused imports
- added Eclipse to gitignore
- Remove ignored files
File Changes
- D .classpath https://github.com/246overclocked/scorpion/pull/3/files#diff-0 (8)
- M .gitignore https://github.com/246overclocked/scorpion/pull/3/files#diff-1 (51)
- D .project https://github.com/246overclocked/scorpion/pull/3/files#diff-2 (18)
- D bin/org/usfirst/frc/team246/robot/OI$7.class https://github.com/246overclocked/scorpion/pull/3/files#diff-3 (0)
- D bin/org/usfirst/frc/team246/robot/OI$8.class https://github.com/246overclocked/scorpion/pull/3/files#diff-4 (0)
- D bin/org/usfirst/frc/team246/robot/OI.class https://github.com/246overclocked/scorpion/pull/3/files#diff-5 (0)
- D bin/org/usfirst/frc/team246/robot/Robot$AnalogInputCollector.class https://github.com/246overclocked/scorpion/pull/3/files#diff-6 (0)
- D bin/org/usfirst/frc/team246/robot/Robot$RobotMode.class https://github.com/246overclocked/scorpion/pull/3/files#diff-7 (0)
- D bin/org/usfirst/frc/team246/robot/Robot.class https://github.com/246overclocked/scorpion/pull/3/files#diff-8 (0)
- D bin/org/usfirst/frc/team246/robot/RobotMap$ArmSetpoints.class https://github.com/246overclocked/scorpion/pull/3/files#diff-9 (0)
- D bin/org/usfirst/frc/team246/robot/RobotMap$LiftSetpoints.class https://github.com/246overclocked/scorpion/pull/3/files#diff-10 (0)
- D bin/org/usfirst/frc/team246/robot/RobotMap.class https://github.com/246overclocked/scorpion/pull/3/files#diff-11 (0)
- D bin/org/usfirst/frc/team246/robot/commands/Auto20Points$1.class https://github.com/246overclocked/scorpion/pull/3/files#diff-12 (0)
- D bin/org/usfirst/frc/team246/robot/commands/Auto20Points$2.class https://github.com/246overclocked/scorpion/pull/3/files#diff-13 (0)
- D bin/org/usfirst/frc/team246/robot/commands/Auto20Points$3.class https://github.com/246overclocked/scorpion/pull/3/files#diff-14 (0)
- D bin/org/usfirst/frc/team246/robot/commands/Auto20Points.class https://github.com/246overclocked/scorpion/pull/3/files#diff-15 (0)
- D bin/org/usfirst/frc/team246/robot/commands/EngageScorpionMode.class https://github.com/246overclocked/scorpion/pull/3/files#diff-16 (0)
- D bin/org/usfirst/frc/team246/robot/commands/ReleaseStack$1.class https://github.com/246overclocked/scorpion/pull/3/files#diff-17 (0)
- D bin/org/usfirst/frc/team246/robot/subsystems/Grabber.class https://github.com/246overclocked/scorpion/pull/3/files#diff-18 (0)
- D build/org/usfirst/frc/team246/robot/OI$7.class https://github.com/246overclocked/scorpion/pull/3/files#diff-19 (0)
- D build/org/usfirst/frc/team246/robot/OI$8.class https://github.com/246overclocked/scorpion/pull/3/files#diff-20 (0)
- D build/org/usfirst/frc/team246/robot/OI.class https://github.com/246overclocked/scorpion/pull/3/files#diff-21 (0)
- D build/org/usfirst/frc/team246/robot/Robot$AnalogInputCollector.class https://github.com/246overclocked/scorpion/pull/3/files#diff-22 (0)
- D build/org/usfirst/frc/team246/robot/Robot$RobotMode.class https://github.com/246overclocked/scorpion/pull/3/files#diff-23 (0)
- D build/org/usfirst/frc/team246/robot/Robot.class https://github.com/246overclocked/scorpion/pull/3/files#diff-24 (0)
- D build/org/usfirst/frc/team246/robot/RobotMap$ArmSetpoints.class https://github.com/246overclocked/scorpion/pull/3/files#diff-25 (0)
- D build/org/usfirst/frc/team246/robot/RobotMap$LiftSetpoints.class https://github.com/246overclocked/scorpion/pull/3/files#diff-26 (0)
- D build/org/usfirst/frc/team246/robot/RobotMap.class https://github.com/246overclocked/scorpion/pull/3/files#diff-27 (0)
- D build/org/usfirst/frc/team246/robot/commands/Auto20Points$1.class https://github.com/246overclocked/scorpion/pull/3/files#diff-28 (0)
- D build/org/usfirst/frc/team246/robot/commands/Auto20Points$2.class https://github.com/246overclocked/scorpion/pull/3/files#diff-29 (0)
- D build/org/usfirst/frc/team246/robot/commands/Auto20Points$3.class https://github.com/246overclocked/scorpion/pull/3/files#diff-30 (0)
- D build/org/usfirst/frc/team246/robot/commands/Auto20Points.class https://github.com/246overclocked/scorpion/pull/3/files#diff-31 (0)
- D build/org/usfirst/frc/team246/robot/commands/EngageScorpionMode.class https://github.com/246overclocked/scorpion/pull/3/files#diff-32 (0)
- D build/org/usfirst/frc/team246/robot/commands/ReleaseStack$1.class https://github.com/246overclocked/scorpion/pull/3/files#diff-33 (0)
- D build/org/usfirst/frc/team246/robot/subsystems/Grabber.class https://github.com/246overclocked/scorpion/pull/3/files#diff-34 (0)
- D dist/FRCUserProgram.jar https://github.com/246overclocked/scorpion/pull/3/files#diff-35 (0)
- M src/org/usfirst/frc/team246/robot/OI.java https://github.com/246overclocked/scorpion/pull/3/files#diff-36 (11)
- M src/org/usfirst/frc/team246/robot/Robot.java https://github.com/246overclocked/scorpion/pull/3/files#diff-37 (27)
- M src/org/usfirst/frc/team246/robot/RobotMap.java https://github.com/246overclocked/scorpion/pull/3/files#diff-38 (6)
- M src/org/usfirst/frc/team246/robot/commands/AdjustTote.java https://github.com/246overclocked/scorpion/pull/3/files#diff-39 (2)
- M src/org/usfirst/frc/team246/robot/commands/Auto20PointsNoArm.java https://github.com/246overclocked/scorpion/pull/3/files#diff-40 (3)
- M src/org/usfirst/frc/team246/robot/commands/Auto2Can.java https://github.com/246overclocked/scorpion/pull/3/files#diff-41 (1)
- M src/org/usfirst/frc/team246/robot/commands/AutoDriveSimple.java https://github.com/246overclocked/scorpion/pull/3/files#diff-42 (2)
- M src/org/usfirst/frc/team246/robot/commands/AutoGetAllTotes.java https://github.com/246overclocked/scorpion/pull/3/files#diff-43 (2)
- M src/org/usfirst/frc/team246/robot/commands/AutoSlideCan.java https://github.com/246overclocked/scorpion/pull/3/files#diff-44 (3)
- M src/org/usfirst/frc/team246/robot/commands/AutoSpin.java https://github.com/246overclocked/scorpion/pull/3/files#diff-45 (4)
- M src/org/usfirst/frc/team246/robot/commands/AutoTest.java https://github.com/246overclocked/scorpion/pull/3/files#diff-46 (3)
- M src/org/usfirst/frc/team246/robot/commands/EngageScorpionMode.java https://github.com/246overclocked/scorpion/pull/3/files#diff-47 (1)
- M src/org/usfirst/frc/team246/robot/commands/ExitScorpionMode.java https://github.com/246overclocked/scorpion/pull/3/files#diff-48 (1)
- M src/org/usfirst/frc/team246/robot/commands/LiftManualGas.java https://github.com/246overclocked/scorpion/pull/3/files#diff-49 (2)
- M src/org/usfirst/frc/team246/robot/commands/ManualArm.java https://github.com/246overclocked/scorpion/pull/3/files#diff-50 (3)
- M src/org/usfirst/frc/team246/robot/commands/OTSGetTote.java https://github.com/246overclocked/scorpion/pull/3/files#diff-51 (3)
- M src/org/usfirst/frc/team246/robot/commands/ProcessLandfill.java https://github.com/246overclocked/scorpion/pull/3/files#diff-52 (3)
- M src/org/usfirst/frc/team246/robot/commands/ReleaseStack.java https://github.com/246overclocked/scorpion/pull/3/files#diff-53 (1)
- M src/org/usfirst/frc/team246/robot/commands/TransitionOverCeiling.java https://github.com/246overclocked/scorpion/pull/3/files#diff-54 (2)
- M src/org/usfirst/frc/team246/robot/overclockedLibraries/SwerveModule.java https://github.com/246overclocked/scorpion/pull/3/files#diff-55 (1)
- M src/org/usfirst/frc/team246/robot/subsystems/Drivetrain.java https://github.com/246overclocked/scorpion/pull/3/files#diff-56 (4)
- M src/org/usfirst/frc/team246/robot/subsystems/Grabber.java https://github.com/246overclocked/scorpion/pull/3/files#diff-57 (6)
- M src/org/usfirst/frc/team246/robot/subsystems/Pusher.java https://github.com/246overclocked/scorpion/pull/3/files#diff-58 (2)
Patch Links:
- https://github.com/246overclocked/scorpion/pull/3.patch
- https://github.com/246overclocked/scorpion/pull/3.diff
— Reply to this email directly or view it on GitHub https://github.com/246overclocked/scorpion/pull/3.
@PaulTerrasi, please never ever ever ever ever ever ever ever ever again use
git add -f
. In fact, please re-clone the repo if you ever want to push changes, so you don't add back the stuff I removed. FYI, the right way to git add isgit add .
, not -f since that overrides the.gitignore
.