Difference between revisions of "Day 3"
From Bambi
(→LESSONS LEARNED) |
|||
| Line 19: | Line 19: | ||
To fix head detached state: | To fix head detached state: | ||
| − | # <code>git checkout <original-branch></code> e.g. release/kinetic/mavlink | + | # <code>git checkout <original-branch></code> e.g. release/kinetic/mavlink --> <code>Previous HEAD position was fdea82a...</code> |
| − | # <code>git merge <your-temporary-branch-number-from-head-detached></code> | + | # <code>git merge <your-temporary-branch-number-from-head-detached></code> with head position number from point 1 |
# <code>git push</code> | # <code>git push</code> | ||
Latest revision as of 21:35, 7 August 2018
- Setup ROS development environment using Eclipse Oxygen
-
catkin config -G"Eclipse CDT4 - Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_ARG1=-std=c++11 -D__cplusplus=201103L -D__GXX_EXPERIMENTAL_CXX0X__=1 -
bash -i -c "eclipse"
-
- Discussed messages and nodes design
- Switched back to QtCreator for new bambi ros package, because we noticed the catkin build tool support (not
catkin_make) - Refactored bambi repository!
- Created submodules for mavlink and mavros
- Checked it in as whole catkin workspace
- PROVIDED developer setup shell script (!)
LESSONS LEARNED
In a submodule we are initially detached from the original repository, i.e. git push will not push to the originating remote repository (which makes actually sense, since we are in a submodule and won't necessary change the original repository (we are formally not working on them). So any commit in the submodule will result in a HEAD DETACHED state.
If we anyhow want to commit to the main repository of the submodule we have to checkout first:
-
git checkout <original-branch>e.g. release/kinetic/mavlink
To fix head detached state:
-
git checkout <original-branch>e.g. release/kinetic/mavlink -->Previous HEAD position was fdea82a... -
git merge <your-temporary-branch-number-from-head-detached>with head position number from point 1 -
git push
