search

frc868 / 2017-robot

The code for FRC 868's 2017 robot, Ratchet
1 stars 1 forks source link

DriveDistance enhancements #137

Closed paul-blankenbaker closed 7 years ago

paul-blankenbaker commented 7 years ago

Added some optional abilities:

See issue #136

karagenit commented 7 years ago

For some reason, we were getting merge conflicts . . . git was saying the commits you made changed the entire file, and saying that you essentially deleted & readded lines that you had not changed. Were you using Eclipse to edit and Eclipse git to commit?

paul-blankenbaker commented 7 years ago

Yes, I was using Eclipse to edit and Eclipse to commit. Should I be using git from the command line and emacs instead?

I am not sure what went wrong as things looked like what I would expect on my first two commits, then it looks like things went south on the 3rd commit (that I think you did as it has a "with karagenit" in the message). Here is the log:

https://github.com/frc868/2017-robot/pull/137/commits

I've merged master back into this branch, but at this point I'm wondering if it will be faster for me to start over with a new branch.

aryker commented 7 years ago

Usually when that happens, it helps to merge master into your branch, then commit and push:

git checkout git merge master git push

On Sun, Mar 26, 2017 at 9:28 PM, Paul Blankenbaker <notifications@github.com

wrote:

Yes, I was using Eclipse to edit and Eclipse to commit. Should I be using git from the command line and emacs instead?

I am not sure as things looked like what I would expect on my first two commits, then it looks like things went south on the 3rd commit (that I think you did). Here is the log:

https://github.com/frc868/2017-robot/pull/137/commits

I've merged master back into this branch, but at this point I'm wondering if it will be faster for me to start over with a new branch.

— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/frc868/2017-robot/pull/137#issuecomment-289333509, or mute the thread https://github.com/notifications/unsubscribe-auth/AE4PFP-rSGpioZVKAoafKRIkVnXq3oMwks5rpxCpgaJpZM4MpkN1 .

aryker commented 7 years ago

Oops, I didn't see that you had already done that. Sorry.

paul-blankenbaker commented 7 years ago

This pull request can be ignored/discarded. It has been replaced by the drive-dist-enhance3 branch.