| 02:41 | <jarhar> | this is correct, i fixed the bug but it hasnt reached stable yet probably |
| 11:08 | <annevk> | jarhar: hey, I was looking at merging the <select> PR, but it has a merge conflict and my usual way of dealing with that doesn't work because this branch has never really been rebased it seems and has 180 commits... That also makes me a little worried that even with that resolved, squash & merge won't necessarily do what we'd expect. |
| 12:07 | <Thirukkumaran> | Hi, I’m Thirukkumaran. I’m a beginner web developer with some experience in HTML, CSS, JavaScript, and React. I’m interested in learning more about web standards and contributing to the open web! |
| 12:54 | <annevk> | jarhar: I suppose one thing I could do is let GitHub generate a patch file from the PR using the .patch extension and then replace the entire PR with that (rebased). |
| 12:57 | <jmdyck> | But if git is giving you a merge conflict, then the patch might fail too? |
| 12:58 | <annevk> | jmdyck: it will, but it'll be easier to rebase I'm hoping. Anyway, I'll wait for jarhar to chime in, as what is another day at this point... |
| 17:39 | <jarhar> | @annevk i fixed the merge conflict, then squashed rebased and force pushed. i also pushed another branch to my fork before force pushing so that the other commits are still in the tree so that the comments in the PR don't lose their context. This is the same thing that I did for the popover spec PR, although I haven't noticed any of the select PRs failing to load the diff like what happened with the popover spec PR. |