nitinitt commented on PR #1896: URL: https://github.com/apache/cassandra-java-driver/pull/1896#issuecomment-2098926296
> @nitinitt Probably the most straightforward way to incorporate the changes would be to get a patch file from the other PR and then apply that patch to this PR. You can get the patch file with something like the following command: > > ``` > curl -L https://github.com/absurdfarce/cassandra-java-driver/pull/1.patch > 1896-refactor.patch > ``` > > You can then apply the changes using git. If you want to just bring in the changes and commit them yourself you can use "git apply": > > ``` > git apply 1896-refactor.patch > ``` > > Or you can directly create new commits in your repo for every commit in the patch file using "git am": > > ``` > git am 1896-refactor.patch > ``` > > If you're at all unsure about what to do it's probably best to start with "git apply". The changes will be applied to the files but nothing will be committed; you can always do a "git reset" to get your repo back to the state of your last commit. Note that if you have any other local changes "git reset" will remove those as well so be careful when you use it! > > I just tested this locally and a patch file built of of commit [this commit](https://github.com/absurdfarce/cassandra-java-driver/pull/1/commits/0e010cb5d2bc8697a47cad7f3ce39aaefdb5fe92) applies cleanly to a working branch containing the same commits you have in your PR branch. Thank you @absurdfarce for the steps, I was able to get the patch and apply it over the last commit using: `git apply 1896-refactor.patch`. Would this PR be merged and part of next release? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
