search

robotology / walking-teleoperation

Software related to walking and teleoperation.
BSD 3-Clause "New" or "Revised" License
30 stars 14 forks source link

Merge Devel to Master #67

Closed kouroshD closed 3 years ago

kouroshD commented 3 years ago

Ciao @traversaro @S-Dafarra @GiulioRomualdi . As you can see, the devel and master branch histories are diverged, even if those commits of master, already are in devel only with different commit hash. We know devel is working fine. In order to cleanly, merge the devel into master, I found this solution and I tried on my terminal without any problem. Let me know if this is fine for you. I will directly push to devel and master:

# to be sure my local bracnhes are updated
- git checkout master
- git pull origin master
- git checkout devel
- git pull origin devel
# first merge the master into devel, knowing that devel is correct (i.e., I want to keep devel) 
- git checkout devel
- git merge master -s ours
- git checkout master
-  git merge devel

After this steps, here are the results for the devel and master branches:

- git checkout master
-  git log --oneline
9d13329 (HEAD -> master, devel) Merge branch 'master' into devel
1ff864d (origin/devel) Merge pull request #61 from robotology/feature/virtualizer_new_approach
8a2ed84 update the configuration and application files for virtualizer cmd to walking controller
a724176 Use buffer port to stream the desired robot pose
c7d0c79 fix the wrist joints list for Xsens/iFeel joint retargeting (#64)
b27616c Add iFeel option to Walking Teleoperation (#59)
f1223c1 Fix oculus xsens (#58)
86c3a04 fix changes for the inclusion of the hde thrift msgs (#57)
8558c46 Fix the open of the orientation port
22c6b65 Use a deadzone for the linear speed
4a7caec Removed --context when calling the VirtualizerModule from yarpmanager
41f301e Copy of the virtualizerConfig file for all the robots
bd69d47 We open the orientation port anyways
9ec1b65 Some tuning on the robot.
2a8c0b3 Fixed sign issue when computing the velocity
c443cd1 Fixed a stupid bug when checking the window size
25075ae Added head control
a6a8193 Added parameter to use only the head for turning
9b0595c The robot orientation port gets opened only if used
b992d56 Added first implementation of ring velocity control
cbb4cfc Moved the virtualizerConfig file to the robot's folder
270c118 Updated Oculus application with parameters to have cameras aligned.
a13027c Modified Dependencies.md to document libfvad dependency.
6fc58d5 Update Xprize application to use the new face expressions module.
b5b7019 Added first version of FaceExpressionsRetargeting module.
01547aa Moved some required dependencies to a single place.
257b8d9 (tag: v1.1.0, origin/master, origin/HEAD) Update the project version on CMakeLists.txt
076ecab Add configuration file for XPRIZE demo Feb 2021 (#47)
42480ba Use fast_tcp for the audio ports (#46)
81c3827 Added possibility to reset the cameras at startup. (#45)
4346502 Manage CybSDK as other dependencies (#44)
15118ba add glove option to the Oculus Retargeting Module (#42)
7eb5ab1 Add application for audio retargeting (#41)
c552197 Remove useless connection in dcmWalkingRetargeting (#40)
a5c8da9 Update the Cyberith SDK documentation (#38)
8fab1ed Update the Virtualizer Module with the new version of the Cyberith treadmill  (#37)
5b7bb95 Update the project version on CMakeLists.txt
fb39923 Merge branch 'master' into devel
21dfbc8 Add configuration file for XPRIZE demo Feb 2021 (#47)
99e8c5e (tag: v1.0.0) Update CMakeLists.txt (#48)
9bc40b0 Use fast_tcp for the audio ports (#46)
e6ec327 Added possibility to reset the cameras at startup. (#45)
ce236cc Manage CybSDK as other dependencies (#44)
5fa28c0 add glove option to the Oculus Retargeting Module (#42)
dfd933d Add application for audio retargeting (#41)
6e38b8d Remove useless connection in dcmWalkingRetargeting (#40)
958e01d Update the Cyberith SDK documentation (#38)
20c3068 Update the Virtualizer Module with the new version of the Cyberith treadmill  (#37)
99e29a4 Merge pull request #35 from robotology/devel
88a7b1d Update CMakeLists.txt project version
40c12db Merge branch 'master' into devel
75169f6 Update the ReadMe, frame Documentation, and License info of the repo (#32)
5ae5a89 update kinematic scaling for task-space retargeting (#30)
088b318 Add CI to the project and fix the bugs related to windows build (#31)
6b7ac44 Merge pull request #28 from kouroshD/feature/addLogger_develRebased
db3bad5 fix some notations
1bf34a7 add the position changes for teleoeration frame
559fded fix some bugs
786b357 head neck values smooth preparation and update the configuration files
f53dd11 update the configuration files

and for the devel branch:

- git checkout devel 
-  git log --oneline
9d13329 (HEAD -> devel, master) Merge branch 'master' into devel
1ff864d (origin/devel) Merge pull request #61 from robotology/feature/virtualizer_new_approach
8a2ed84 update the configuration and application files for virtualizer cmd to walking controller
a724176 Use buffer port to stream the desired robot pose
c7d0c79 fix the wrist joints list for Xsens/iFeel joint retargeting (#64)
b27616c Add iFeel option to Walking Teleoperation (#59)
f1223c1 Fix oculus xsens (#58)
86c3a04 fix changes for the inclusion of the hde thrift msgs (#57)
8558c46 Fix the open of the orientation port
22c6b65 Use a deadzone for the linear speed
4a7caec Removed --context when calling the VirtualizerModule from yarpmanager
41f301e Copy of the virtualizerConfig file for all the robots
bd69d47 We open the orientation port anyways
9ec1b65 Some tuning on the robot.
2a8c0b3 Fixed sign issue when computing the velocity
c443cd1 Fixed a stupid bug when checking the window size
25075ae Added head control
a6a8193 Added parameter to use only the head for turning
9b0595c The robot orientation port gets opened only if used
b992d56 Added first implementation of ring velocity control
cbb4cfc Moved the virtualizerConfig file to the robot's folder
270c118 Updated Oculus application with parameters to have cameras aligned.
a13027c Modified Dependencies.md to document libfvad dependency.
6fc58d5 Update Xprize application to use the new face expressions module.
b5b7019 Added first version of FaceExpressionsRetargeting module.
01547aa Moved some required dependencies to a single place.
257b8d9 (tag: v1.1.0, origin/master, origin/HEAD) Update the project version on CMakeLists.txt
076ecab Add configuration file for XPRIZE demo Feb 2021 (#47)
42480ba Use fast_tcp for the audio ports (#46)
81c3827 Added possibility to reset the cameras at startup. (#45)
4346502 Manage CybSDK as other dependencies (#44)
15118ba add glove option to the Oculus Retargeting Module (#42)
7eb5ab1 Add application for audio retargeting (#41)
c552197 Remove useless connection in dcmWalkingRetargeting (#40)
a5c8da9 Update the Cyberith SDK documentation (#38)
8fab1ed Update the Virtualizer Module with the new version of the Cyberith treadmill  (#37)
5b7bb95 Update the project version on CMakeLists.txt
fb39923 Merge branch 'master' into devel
21dfbc8 Add configuration file for XPRIZE demo Feb 2021 (#47)
99e8c5e (tag: v1.0.0) Update CMakeLists.txt (#48)
9bc40b0 Use fast_tcp for the audio ports (#46)
e6ec327 Added possibility to reset the cameras at startup. (#45)
ce236cc Manage CybSDK as other dependencies (#44)
5fa28c0 add glove option to the Oculus Retargeting Module (#42)
dfd933d Add application for audio retargeting (#41)
6e38b8d Remove useless connection in dcmWalkingRetargeting (#40)
958e01d Update the Cyberith SDK documentation (#38)
20c3068 Update the Virtualizer Module with the new version of the Cyberith treadmill  (#37)
99e29a4 Merge pull request #35 from robotology/devel
88a7b1d Update CMakeLists.txt project version
40c12db Merge branch 'master' into devel
75169f6 Update the ReadMe, frame Documentation, and License info of the repo (#32)
5ae5a89 update kinematic scaling for task-space retargeting (#30)
088b318 Add CI to the project and fix the bugs related to windows build (#31)
6b7ac44 Merge pull request #28 from kouroshD/feature/addLogger_develRebased
db3bad5 fix some notations
1bf34a7 add the position changes for teleoeration frame
559fded fix some bugs
786b357 head neck values smooth preparation and update the configuration files
f53dd11 update the configuration files

In this way, as you can see, I avoided rewriting the history of devel and master, while keeping the PR traces on both master and devel.

The results of the git diff is empty, i.e.:

git diff 9d13329 1ff864d

If you can try this solution on your machine, it will be great. Since, I want to avoid rewriting the histories of the two branches.

S-Dafarra commented 3 years ago

Ah well done @kouroshD, I did not know about the merging strategies. Your plan looks good to me

traversaro commented 3 years ago

Ok for me.