René's URL Explorer Experiment

{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"Incompatible forks | Clean Git History ","articleBody":"Hi Jan,\r\n\r\nI was using your https://github.com/getnamo/tensorflow-ue4 inside my project.\r\nWhich required\r\nhttps://github.com/getnamo/UnrealEnginePython/\r\ninstead of \r\nhttps://github.com/20tab/UnrealEnginePython/\r\n\r\nNow I already had my own fork, but since the changes were small I just did a hard reset to your version and redid the changes.\r\n\r\nAfter some time I upgraded my Unreal Engine. Of course this did not work with your specific fork. So I disabled the tensorflow plugin and switched back to the original '20tab/UnrealEnginePython/'. The main reason for switching back was that Robert (20tab) pulled my changes and my tensorflow code was not yet fully implemented.\r\n\r\nNow I would like to use Tensorflow, but it seems your fork is not compatible with the original master, check: \r\nhttps://github.com/20tab/UnrealEnginePython/compare/master...getnamo:master\r\n\r\nSide Note: To avoid future headache (and typing commands) I automated updating my fork so that it is exactly same as 20tab, by using a cron command with:\r\ngit pull 20tab master --rebase\r\ngit push\r\n(20tab is my remote name, use 'remove -v' to check your remote name)\r\n\r\nNow I saw your comment here about creating a clean pull request:\r\nhttps://github.com/20tab/UnrealEnginePython/pull/539#issuecomment-432776153\r\n\r\nAnd so I wondered if you would be willing to cleanup your fork as well ^^.\r\nSo in that case we can use merge / fast forward again. (and perhaps create a pull on 20tab fork with all your changes, so that all forks stay in sync)\r\n\r\nLooking at the compare\r\nhttps://github.com/20tab/UnrealEnginePython/compare/master...getnamo:master\r\n\r\nIt seems that sometimes you pull / merge within GitHub.com (e.g it shows 'verified'), while other times you did it using a git cmd.\r\nPersonally I stopped using GitHub.com pull / merge, since it contaminated the history with 'Merge branch 'master' of \u003curl\u003e into \u003cbranch\u003e'.\r\n\r\nNow I'm not a git guru by any means, but I think it should be quite easy to fix.\r\n- by using a git rebase -i (\u003chash\u003e from before the changes).\r\nOr something specified here:\r\nhttp://sethrobertson.github.io/GitFixUm/fixup.html\r\n\r\nRegard,\r\n\r\nTQwan\r\n\r\nNote: Sorry for the long post. ","author":{"url":"https://github.com/TQwan","@type":"Person","name":"TQwan"},"datePublished":"2018-11-07T10:51:03.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":1},"url":"https://github.com/11/UnrealEnginePython/issues/11"}