Ask Your Question
1

Resolving conflicts in PR

asked 2017-08-16 11:18:18 -0600

Aravind gravatar image

updated 2017-08-16 13:50:45 -0600

Hi:

I recently submitted a PR. However, there were some failing tests which I have addressed. I also find that there is now a conflict with the lunar-devel branch. I'm not sure what is the best way to proceed from here? I can add more commits to the PR which will fix the failing tests, but I don't know how to fix the conflict in the PR. Do I rebase my branch to the head of the lunar-devel branch? or is there some other recommended way?

Also, it seems that the lunar-devel branch has some failed tests and therefore the PR also has some failed tests. How can I resolve this?

I'd appreciate any pointers to this.

[edit1] In particular, I'm refering to the ros_comm package and the Secure ROS PR: https://github.com/ros/ros_comm/pull/...

Thanks, Aravind.

edit retag flag offensive close merge delete

Comments

What package/repository are you referring to? Also, this may be better answered in the repository that you're try to do a pull request in.

jayess gravatar imagejayess ( 2017-08-16 12:38:43 -0600 )edit

Thanks for the response. I've updated my original question. When you say, answered in the original repository, do you mean a comment on the PR or something else?

Aravind gravatar imageAravind ( 2017-08-16 13:51:56 -0600 )edit
1

Yes, there or maybe an issue.

jayess gravatar imagejayess ( 2017-08-16 14:14:55 -0600 )edit

2 Answers

Sort by ยป oldest newest most voted
3

answered 2017-08-16 13:24:23 -0600

gvdhoorn gravatar image

Even though you refer to branches with ROS release names in them, this is essentially a non-ROS question. To really understand what is going on, I would suggest you take a look at a git / github tutorial or two.

As to your question:

I can add more commits to the PR which will fix the failing tests, but I don't know how to fix the conflict in the PR. Do I rebase my branch to the head of the lunar-devel branch?

Rebasing is probably easiest, provided you have no history that you must preserve.

Also, it seems that the lunar-devel branch has some failed tests and therefore the PR also has some failed tests. How can I resolve this?

That is obviously not something we can answer here, as, as @jayess already noted, we don't know which "pull request" and which particular "lunar-devel branch" you are referring to.

In general though, failures that are not caused by your PR are typically not considered as blockers for a merge.

But this can, and will, differ between repositories, as it's up to the maintainers.

You'll have to ask them.

edit flag offensive delete link more

Comments

I've updated my original post with the particulars. I meant it to be a more general question, and I think your answer is what I was looking for. Thanks!

Aravind gravatar imageAravind ( 2017-08-16 15:16:20 -0600 )edit
0

answered 2017-08-16 15:16:27 -0600

Aravind gravatar image

I also found this link which is helpful and I trust that I can do something similar with my PR.

How to Rebase a Pull Request

edit flag offensive delete link more

Your Answer

Please start posting anonymously - your entry will be published after you log in or create a new account.

Add Answer

Question Tools

1 follower

Stats

Asked: 2017-08-16 11:18:18 -0600

Seen: 79 times

Last updated: Aug 16 '17