From 997de26947dd82317c8892ab88432e4b3d880d25 Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Mon, 20 Apr 2020 18:17:20 -0400 Subject: [PATCH] Setup to move workspaces into root src folder - Fix gitignore paths - Move submodule within ariac_ws in root src folder --- .gitignore | 8 ++++---- .gitmodules | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index cc0b46d..f35239a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ # Don't track the content of these folders # ############################################ -rrrobot_ws/lib/ -rrrobot_ws/build -rrrobot_ws/devel -rrrobot_ws/install +src/rrrobot_ws/lib/ +src/rrrobot_ws/build +src/rrrobot_ws/devel +src/rrrobot_ws/install .* !.gitignore diff --git a/.gitmodules b/.gitmodules index 46a688e..a5c35f1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "ariac_ws/src/universal_robot"] - path = ariac_ws/src/universal_robot + path = src/ariac_ws/src/universal_robot url = https://github.com/osrf/universal_robot branch = ariac_2019_ur10_moveit_config