Split - Githubissues

frc1418 / 2015-ui

Team 1418's Driver Station code for 2015. DEPRECATED, use https://github.com/FRCDashboard/FRCDashboard

Apache License 2.0

7 stars 5 forks source link

Split #83

Closed 17mahera closed 9 years ago

17mahera commented 9 years ago

This isn’t any better but okay

virtuald commented 9 years ago

So... can I safely assume that Visual Upgrade Pt. 1 is the only piece that matters?

17mahera commented 9 years ago

Yes, although I believe most of the conflicting parts of the code in settings box and aton page tweak should be take priority over current code as it is more compatible with different computers/situations. It is just that try as I may, I cannot delete those original parts and get github to see what I am doing.

virtuald commented 9 years ago

I put the fixed branch in PR #84. In the future, when you have conflicts:

'Revert' doesn't really do what you want it to do, and should generally be avoided
Execute a merge with master, so that the conflicts show up locally
Then edit the file, removing the conflict markers (the ==== things), and commit the result and push again.