-
Notifications
You must be signed in to change notification settings - Fork 2
Upgrading v0.0.0 Template
How to upgrade from version v0.0.0 (unversioned) to version v1.0.0 (released 28 May 2024).
This is a simple guide, if you need further assistance please open an Issue.
- Clone LCAS/main using:
git clone https://github.com/LCAS/environment_template --single-branch -b main
- Add your template branch as a remote:
git remote add rih https://github.com/Iranaphor/riseholme_hall_rooms
- Checkout the branch you wish to upgrade:
git checkout rih0012
- Merge the changes of the template into the environment. At the point of instantiating a template, the git history will be only an
Initial Commit
, thus the branches cannot be merged directly. On merging them, all history of main will be copied into your instantiated template. To allow merging, the argument of--allow-unrelated-histories
must be used:
git merge main --allow-unrelated-histories
- This will highlight all of the changes made to main from the point of instantiation. Add the changes, commit and push back to your repository.
This work was supported by AgriFoRwArdS CDT, under the Engineering and Physical Sciences Research Council [EP/S023917/1].
This work was completed in association with the Agri-OpenCore project under Innovate UK grant 10041179.
For citation of the associated workshop publication please use the following bibtex:
@inproceedings{heselden2024unified,
title={Unified Map Handling for Robotic Systems: Enhancing Interoperability and Efficiency Across Diverse Environments},
author={James R. Heselden and Gautham P. Das},
year={2024},
eprint={2404.13499},
archivePrefix={arXiv},
primaryClass={cs.RO},
booktitle={Proceedings of the Workshop on Field Robotics, ICRA 2024},
address={Yokohama, Japan},
doi={10.48550/arXiv.2404.13499}
}
For citation of this software repository please use the following bibtex:
@misc{LCASEnvironmentTemplate,
author = {Heselden, James R. and Das, Gautham P.},
title = {{Environment Template}},
howpublished = {\url{https://github.com/LCAS/environment_template}},
year = {2024},
note = {Accessed: [access date]}
}