Re: [mh] Any other PRs out there/Need help submitting second PR
Lieven Hollevoet <[email protected]> Mon, 1 Apr 2024 16:18:25 +0200
| Newsgroups | gmane.comp.misc.misterhouse.user |
|---|---|
| Message-ID | <[email protected]> |
--===============8426219841997150510== Content-Type: multipart/signed; boundary="Apple-Mail=_7C325296-4365-45F5-82B8-72361B1FA4FC"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Apple-Mail=_7C325296-4365-45F5-82B8-72361B1FA4FC Content-Type: multipart/alternative; boundary="Apple-Mail=_F08D19D7-9BB0-4916-BD61-7905C9D5D2EC" --Apple-Mail=_F08D19D7-9BB0-4916-BD61-7905C9D5D2EC Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 Hey Brian, The most efficient way to do is is to checkout the master branch, create = a new branch for PR#2, apply the change for PR#2, commit it to the = branch for PR#2. If you then create a pull request for the branch you created for PR#2 it = will only contain that change and not the one for PR#1. The reason you see both changes is because you applied the change for = PR#2 to the same branch of PR#1. Basic idea: different pull request =3D different branch on which you = apply the change. Hope this helps, if it doesn=E2=80=99t please send me a link to the = branch you are working on and we can take a look together. Best regards, Lieven. > Op 31 mrt. 2024, om 21:41 heeft [email protected] het = volgende geschreven: >=20 > On 3/29/24 08:22, H Plato wrote: >> My ask is that if there are any code updates out there that folks = want to include, to put in a pull request so we can capture them. Also, = if anyone can update to master for any testing, that would be great as = well. > Can anybody help me with GitHub? One of my pull requests is trying to = suck in irrelevant changes from another. >=20 > So I fixed a minor detail in the MH master branch and submitted a PR = (call it "PR#1"). Now I have code in a much different and unrelated area = that I also want to submit ("PR#2). But since PR#1 hasn't been committed = upstream yet, PR#2 is trying to also include PR#1 as part of the pull = request. PR#1 affected one file. PR#2 should affect two other files, but = is trying to include all three. How do I send H Plato a PR#2 that = doesn't include files from PR#1? >=20 > -Brian M >=20 > ________________________________________________________ > To unsubscribe from this list, go to: = https://lists.sourceforge.net/lists/listinfo/misterhouse-users >=20 --Apple-Mail=_F08D19D7-9BB0-4916-BD61-7905C9D5D2EC Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8 <html><head><meta http-equiv=3D"content-type" content=3D"text/html; = charset=3Dutf-8"></head><body style=3D"overflow-wrap: break-word; = -webkit-nbsp-mode: space; line-break: after-white-space;">Hey = Brian,<div><br></div><div>The most efficient way to do is is to checkout = the master branch, create a new branch for PR#2, apply the change for = PR#2, commit it to the branch for = PR#2. </div><div><br></div><div>If you then create a pull request = for the branch you created for PR#2 it will only contain that change and = not the one for PR#1.</div><div><br></div><div>The reason you see both = changes is because you applied the change for PR#2 to the same branch of = PR#1. </div><div><br></div><div>Basic idea: different pull request = =3D different branch on which you apply the = change.</div><div><br></div><div>Hope this helps, if it doesn=E2=80=99t = please send me a link to the branch you are working on and we can take a = look together.</div><div><br></div><div>Best = regards,</div><div> Lieven.<br><div><br><blockquote = type=3D"cite"><div>Op 31 mrt. 2024, om 21:41 heeft = [email protected] het volgende geschreven:</div><br = class=3D"Apple-interchange-newline"><div> =20 <meta http-equiv=3D"Content-Type" content=3D"text/html; = charset=3DUTF-8"> =20 <div> <div class=3D"moz-cite-prefix">On 3/29/24 08:22, H Plato wrote:<br> </div> <blockquote type=3D"cite" = cite=3D"mid:[email protected]"> <pre class=3D"moz-quote-pre" wrap=3D"">My ask is that if there are = any code updates out there that folks want to include, to put in a pull = request so we can capture them. Also, if anyone can update to master for = any testing, that would be great as well. </pre> </blockquote><p>Can anybody help me with GitHub? One of my pull = requests is trying to suck in irrelevant changes from another.<br> </p><p>So I fixed a minor detail in the MH master branch and = submitted a PR (call it "PR#1"). Now I have code in a much different and unrelated area that I also want to submit ("PR#2). But since PR#1 hasn't been committed upstream yet, PR#2 is trying to also include PR#1 as part of the pull request. PR#1 affected one file. PR#2 should affect two other files, but is trying to include all three. How do I send H Plato a PR#2 that doesn't include files from = PR#1?</p><p> &n= bsp; -Brian M<br> </p> </div> ________________________________________________________<br>To = unsubscribe from this list, go to: = https://lists.sourceforge.net/lists/listinfo/misterhouse-users<br><br></di= v></blockquote></div><br></div></body></html>= --Apple-Mail=_F08D19D7-9BB0-4916-BD61-7905C9D5D2EC-- --Apple-Mail=_7C325296-4365-45F5-82B8-72361B1FA4FC Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEungENbJWmfpYUYH8+1fNjhtKk2wFAmYKwjEACgkQ+1fNjhtK k2wCdw//S626xcx1gi5igkw+9IfQEUwumuciyQyFJP25Gyheal3OH3wLwRs/Uqpu JbNAbGD3CSjjhPMF017dLC2VbnxFjB6t+t10sVMXh14lS/vUUMpWVChISRiPef52 UA5rhZbGXo7bYFsNVXBkR4iUiCErC/piZsV8PREHXZ5YVX9SE8jC5vtZn8TvCz9s WYcbG/JWyax+AqP+eCabASMhyVusPlWz63gN8yCG4i6w9Vbigso6ZU7X5nZAGqcx 5wgHwQkEGCRl9aPtyQxXtSa75aMwTS4arYrvzu87FlvSWOvcsYPZN6pRDEW7XyS5 EbZ+PW+5JF8mQFf29+uvE8XvEFEZyiZvUYmlzIxN07spb3eTJ45UwaUFJBNiSldW aPzeyVOvf/Q017uZnDIvt2BPmoOmI+JFKwFJwYrztW+PalIiD7MJc4qMLQcP+5OD 2pZhAaAMRfBXboJu6t68jB/6G+ldCoBNtRbahghZ0npSxxScknbWSPF71L9nBKn5 xGa+Pic7eCfohGKb1tB8FKf5MbivVGKdbO7VFR/qW/uWwfjOlfjWpR03Xit6J6mc jPEvfTbqL0mrwBjfInTKtQnA+d4SXSR9vu/2t09BHAfIzZj+tBvjfSTiSftquCMU Lfal701WQYex0f8Ec95PwDm2B+qcoJdZPq1B+FyBNiY/EC6e8M8= =mSq2 -----END PGP SIGNATURE----- --Apple-Mail=_7C325296-4365-45F5-82B8-72361B1FA4FC-- --===============8426219841997150510== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline --===============8426219841997150510== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline ________________________________________________________ To unsubscribe from this list, go to: https://lists.sourceforge.net/lists/listinfo/misterhouse-users --===============8426219841997150510==--