githubのローカル（githubの画面）更新？

[kochigami]

kochigami_jsk_robotの画面が、本家のjsk_robotより遅れている 確かに、git statusすると、 masterブランチで Your branch is ahead of 'kochigami_jsk_robot/master' by 137 commitsとでる、 git pull origin master, git pull kochigami_jsk_robot masterしても更新されない（実はこれで良かったんじゃないかと思う） git pull --rebase すると

kochigami@kochigami-ThinkPad-T440p:~/ros/hydro/src/jsk-ros-pkg/jsk_robot/jsk_nao_robot/jsk_nao_startup/launch [(e0dcb5b...)|REBASE]$ git pull origin master 
U   .rosinstall
M   jsk_pr2_robot/jsk_pr2_calibration/CMakeLists.txt
D   jsk_pr2_robot/jsk_pr2_calibration/jsk_pr2.urdf
M   jsk_pr2_robot/jsk_pr2_calibration/package.xml
Pull is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>'
as appropriate to mark resolution, or use 'git commit -a'.

git checkout master
.rosinstall: needs merge
error: you need to resolve your current index first

になるので、

kochigami@kochigami-ThinkPad-T440p:~/ros/hydro/src/jsk-ros-pkg/jsk_robot/jsk_nao_robot [(e0dcb5b...)|REBASE]$ git fetch origin 
kochigami@kochigami-ThinkPad-T440p:~/ros/hydro/src/jsk-ros-pkg/jsk_robot/jsk_nao_robot [(e0dcb5b...)|REBASE]$ git reset --hard origin/master 
HEAD is now at 2704edf Merge pull request #212 from aginika/add-wait-time-for-suction
kochigami@kochigami-ThinkPad-T440p:~/ros/hydro/src/jsk-ros-pkg/jsk_robot/jsk_nao_robot [(2704edf...)|REBASE]$ git checkout master 
Switched to branch 'master'
Your branch is ahead of 'kochigami_jsk_robot/master' by 137 commits.
kochigami@kochigami-ThinkPad-T440p:~/ros/hydro/src/jsk-ros-pkg/jsk_robot/jsk_nao_robot [master|REBASE]$ 

という状況

[kochigami]

git rebase --abortしたらブランチはmasterに切り替わった git statusで

# On branch master
# Your branch is ahead of 'kochigami_jsk_robot/master' by 137 commits.
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#   ../jsk_baxter_robot/baxtereus/baxter.dae
#   ../jsk_baxter_robot/baxtereus/baxter.urdf
#   build/
#   nao_jsk_teleop/bin/
#   nao_jsk_teleop/build/
#   naoeus/build/
#   naoeus/euslisp/nao.l
#   naoeus/launch/nao_driver_temp.launch
#   ../jsk_pepper_robot/jsk_pepper_startup/sample/#sample#
#   ../jsk_pepper_robot/jsk_pepper_startup/sample/#sample.l#
#   ../jsk_pepper_robot/jsk_pepper_startup/sample/learn_face.l
nothing added to commit but untracked files present (use "git add" to track)

謎は多いけどこれでちょっとひとまずやめておこう

[kochigami]

自分の画面は変更されてなくていいみたい