Updating a GitHub iOS SDK without overwriting custom changes

Question

About a year ago I built an iOS app for my Company using the Shopify mobile buy sdk located at: https://github.com/Shopify/mobile-buy-sdk-ios

While customizing this app to suit my company's needs, I made numerous customizations to this sdk, changing many of the core files, and completely changing the storyboard. Since then, I've kind of let it sit and have been focused on other non iOS projects.

Now to my question - I need to update my app to include the latest modifications of the base SDK for swift 5.0.

Essentially, I think the question I'm asking is how do I merge these two repositories, added the necessary changes, and not overwriting my custom changes.

I've been doing a bunch of searching, and I don't think I'm using the right terminology to get to the answer I need. I might have not even titled this question appropriately...

I think what I need to do is "merge two repositories" using the GitHub app where I can see the changes that will be made, line by line, and approve the necessary ones. However, I'm having trouble finding a suitable guide on how to start this process.

Does anyone have any suggestions on how to tackle the problem appropriately, or even just a link to an article that accurately describes the problem I'm facing. Thanks!

Answer 1

Follow the bellow step, so that you can find modifications between the branches. 1. New pull request 2. select "base" & "compare" branches. you can easily find the changes as well as conflicts also.