Welcome to Doom9's Forum, THE in-place to be for everyone interested in DVD conversion.

Before you start posting please read the forum rules. By posting to this forum you agree to abide by the rules.

 

Go Back   Doom9's Forum > Programming and Hacking > Development

Reply
 
Thread Tools Search this Thread Display Modes
Old 4th February 2021, 12:41   #1  |  Link
stax76
Registered User
 
stax76's Avatar
 
Join Date: Jun 2002
Location: On thin ice
Posts: 6,837
Problem creating a pull request on github

I want to create a pull request for this project:

https://github.com/chikuzen/avs2pipemod

So I created a fork:

https://github.com/staxrip/avs2pipemod

It did not compile out of the box due to missing avisynth headers, so I changed the project to make it find the header, now it compiles.

Now I created a branch and made my changes I want to be in the pull request, that is adding a UTF8 and long path manifest.

Problem is now when I create a pull request it also includes the header change, but I want that to be excluded.

How would I do this? Is it possible without command line but rather Visual Studio, GitHub Desktop and GitHub Web?
stax76 is offline   Reply With Quote
Old 4th February 2021, 18:54   #2  |  Link
MasterNobody
Registered User
 
Join Date: Jul 2007
Posts: 552
You need to edit your commit history (git rebase -i HEAD~3) in UTF8-and-long-path-manifest branch and remove 5f5c119919f1bc3f5154e70304f716f228aca230 commit from it. After that force push it to github.

Or create another branch at 7b7e76516ae20ec1f1f67548461b3c622cfaec1b (master from chikuzen) and cherry pick there only 3b5856d156a25e9fe1341966832bdb3939f27050.

Last edited by MasterNobody; 4th February 2021 at 18:58.
MasterNobody is offline   Reply With Quote
Old 14th March 2021, 18:29   #3  |  Link
stax76
Registered User
 
stax76's Avatar
 
Join Date: Jun 2002
Location: On thin ice
Posts: 6,837
I'm not really understanding the first method, but the second one worked well:

https://github.com/chikuzen/avs2pipemod/pull/6

Author seems to be inactive though.

Thanks!
stax76 is offline   Reply With Quote
Reply

Thread Tools Search this Thread
Search this Thread:

Advanced Search
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump


All times are GMT +1. The time now is 18:14.


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2024, vBulletin Solutions Inc.