weixin_39886841
weixin_39886841
2021-01-12 19:30

use common::ToSeconds in local_trajectory_builder and rate_timer.h

use the new overload of ToSeconds (introduced in PR1244) in local_trajectory_builder.

该提问来源于开源项目:cartographer-project/cartographer

  • 点赞
  • 写回答
  • 关注问题
  • 收藏
  • 复制链接分享
  • 邀请回答

8条回答

  • weixin_39886841 weixin_39886841 4月前

    somehow github doesn't let me add you as a reviewer, but could you please review ;)

    点赞 评论 复制链接分享
  • weixin_39627405 weixin_39627405 4月前

    -the-cartographer merge

    点赞 评论 复制链接分享
  • weixin_39627405 weixin_39627405 4月前

    Seems this has merge conflict. Can you merge master?

    点赞 评论 复制链接分享
  • weixin_39557402 weixin_39557402 4月前

    Merge requested by authorized user wohe. Merge queue now has a length of 1.

    点赞 评论 复制链接分享
  • weixin_39557402 weixin_39557402 4月前

    Error: exit status 1

    Log: ~~~ => handle work item: PR 1248 on googlecartographer/cartographer. => Switching to branch master. $ git reset --hard HEAD [data/cartographer] HEAD is now at afa3ba53 Fix the name of real_time_correlative metric in 2D. (#1247) $ git clean -fd [data/cartographer] $ git checkout master [data/cartographer] Already on 'master' Your branch is up to date with 'origin/master'. $ git pull [data/cartographer] Already up to date. Current branch master is up to date. => Checking out spielawa/spielawa-use-ToSeconds as local branch pr_1248. $ git remote add spielawa git.com:spielawa/cartographer.git [data/cartographer] fatal: remote spielawa already exists. $ git fetch spielawa [data/cartographer] $ git branch --track pr_1248 spielawa/spielawa-use-ToSeconds [data/cartographer] Branch 'pr_1248' set up to track remote branch 'spielawa-use-ToSeconds' from 'spielawa'. => Switching to branch pr_1248. $ git reset --hard HEAD [data/cartographer] HEAD is now at afa3ba53 Fix the name of real_time_correlative metric in 2D. (#1247) $ git clean -fd [data/cartographer] $ git checkout pr_1248 [data/cartographer] Switched to branch 'pr_1248' Your branch is up to date with 'spielawa/spielawa-use-ToSeconds'. $ git pull --force [data/cartographer] Already up to date. Current branch pr_1248 is up to date. => merge master. $ git merge master [data/cartographer] Auto-merging cartographer/mapping/internal/3d/local_trajectory_builder_3d.cc CONFLICT (content): Merge conflict in cartographer/mapping/internal/3d/local_trajectory_builder_3d.cc Auto-merging cartographer/mapping/internal/2d/local_trajectory_builder_2d.cc Automatic merge failed; fix conflicts and then commit the result. => Abandoning branch pr_1248. => Switching to branch master. $ git reset --hard HEAD [data/cartographer] HEAD is now at 7c1b1ffc Ran clang-format. $ git clean -fd [data/cartographer] $ git checkout master [data/cartographer] Switched to branch 'master' Your branch is up to date with 'origin/master'. $ git branch -D pr_1248 [data/cartographer] Deleted branch pr_1248 (was 7c1b1ffc).

    ~~~

    点赞 评论 复制链接分享
  • weixin_39886841 weixin_39886841 4月前

    Done. could you please tell Wally again to merge?

    点赞 评论 复制链接分享
  • weixin_39627405 weixin_39627405 4月前

    -the-cartographer merge

    点赞 评论 复制链接分享
  • weixin_39557402 weixin_39557402 4月前

    Merge requested by authorized user wohe. Merge queue now has a length of 1.

    点赞 评论 复制链接分享