Results 1 to 5 of 5

Thread: Problems with 'git checkout master'

  1. #1
    Join Date
    May 2014
    Location
    Carlsbad, CA
    Posts
    31
    Rep Power
    16

    Problems with 'git checkout master'

    I have been using Renee's 'dev' branch for the Framework.
    I noticed that the 'master' branch has been updated. (With no notification on the Forum.)
    From my directory /HROS1-Framework
    if I do 'git branch' I get:
    * dev
    master

    If I then do 'git checkout master' I get:

    error: Your local changes to the following files would be overwritten by checkout:
    Data/config.ini
    Linux/project/ps3_demo/main.cpp
    Please, commit your changes or statch them before you can switch branches.
    Aborting

    OK, now what do I do?

    Thanks for any help.

  2. #2
    Join Date
    Mar 2015
    Location
    Texas
    Posts
    342
    Images
    15
    Rep Power
    32

    Re: Problems with 'git checkout master'

    In this scenario I believe you are currently using my "fork" of the repository ( https://github.com/r3n33/HROS1-Framework ) and have checked out the 'dev' branch.. and what you are wanting to do is checkout the 'master' branch of the official Interbotix repository ( https://github.com/Interbotix/HROS1-Framework ).

    As far as I know, and this may not be the only way, you'll typically checkout individual repositories ( or forks of repositories in this case ) in their own working directory somewhere in your local filesystem ( ie on the robot ). In this case you have currently checked out the 'dev' branch of my repo to the directory ~/HROS1-Framework on your robot.

    If I was in your position I would rename ~/HROS1-Framework to ~/HROS1-Renee so you could then clone the official repository in your home directory.
    Code:
    cd ~
    mv ~/HROS1-Framework ~/HROS1-Renee
    git clone https://github.com/Interbotix/HROS1-Framework.git
    Or you could chose to make a new directory, say ~/HROS1-Official, and clone the Interbotix copy of the framework. Which will leave my fork in ~/HROS1-Framework along with all your local changes ( Data/config.ini and ps3_demo/main.cpp ).
    Code:
    git clone https://github.com/Interbotix/HROS1-Framework.git ~/HROS1-Official
    Hope this helps.
    01001001001000000100110001101111011101100110010100 10000001010010011011110110001001101111011101000111 0011

    My Instagram
    My YouTube

  3. #3
    Join Date
    May 2014
    Location
    Carlsbad, CA
    Posts
    31
    Rep Power
    16

    Re: Problems with 'git checkout master'

    Renee,

    Once again you have come to my rescue!

    I chose to move to a directory /HROS1-Framework-Renee

    I did the git clone ... and then 'make clean && make' on all the 'project' directories.
    They ran except 'node_server' and 'tutorial'.

    Thank you - again.

  4. #4

    Re: Problems with 'git checkout master'

    node_server and tutorial have sub directors that you compile.
    I wonder if these run normally on the edison? As the head_tracking is inverted on the RPI2.
    Last edited by LloydF; 12-19-2015 at 02:48 AM.

  5. #5
    Join Date
    Mar 2015
    Location
    Texas
    Posts
    342
    Images
    15
    Rep Power
    32

    Re: Problems with 'git checkout master'

    You're welcome. I'm glad I could help!
    01001001001000000100110001101111011101100110010100 10000001010010011011110110001001101111011101000111 0011

    My Instagram
    My YouTube

Thread Information

Users Browsing this Thread

There are currently 1 users browsing this thread. (0 members and 1 guests)

Similar Threads

  1. Just For Fun Master Blaster!
    By djsures in forum Project Showcase
    Replies: 0
    Last Post: 01-11-2011, 03:10 AM
  2. I2C IR Problems?
    By lnxfergy in forum Sensors
    Replies: 0
    Last Post: 02-14-2009, 04:16 PM
  3. Contest Entry TR Community Contests Master List
    By Adrenalynn in forum Project Showcase
    Replies: 3
    Last Post: 08-20-2008, 08:40 AM
  4. Khr 2hv Problems
    By Kondo Dave in forum Humanoids, Walkers & Crawlers
    Replies: 10
    Last Post: 08-02-2008, 10:12 AM
  5. Sabertooth 10a problems
    By Droid Works in forum Arbotix, Microcontrollers, Arduino
    Replies: 15
    Last Post: 04-26-2008, 03:37 AM

Posting Permissions

  • You may not post new threads
  • You may not post replies
  • You may not post attachments
  • You may not edit your posts
  •