Code review comment for ~mgerdts/cloud-init:lp1765801
Revision history for this message
| Mike Gerdts (mgerdts) wrote | # |
© 2004
Canonical Ltd.
•
Terms of use
•
Data privacy
•
Contact Launchpad Support
•
Blog
•
Careers
•
System status
•
f33e652
(Get the code!)
As I asked in IRC on September 25:
[10:27:07] <mgerdts> I rebased an old branch, made some changes, force pushed, then resubmitted a merge request. The diff shows conflicts that don't really exist, seemingly related to the 13 month old version that was previously there. Would it be easier if I just submitted a fresh merge request rather than trying to make this one happy?
[10:27:09] <mgerdts> https:/
I have once again rebased it and force pushed. The diff below still shows the conflict. `git show` in my workspace does not show the conflict. My question from September 25 remains.