How to customize your App and still get all updates

As our source is stored in the Git repository, we would assume you use Git too. Working with other types of version control should be pretty straightforward too. With Git, the trick is to link the code with two repositories simultaneously. It’s not hard and doesn’t lead to a mess. Let’s assume you clone the repo:

git clone https://github.com/ctrlTilde/node-api-skeleton <your_folder_name>

Now, we rename the origin to, say, upstream:

git rename origin upstream

Then we can link the code to our repository:

git remote add origin <your_repo_git_address>

Then work as usual, and make a lot of changes and customizations.

When it’s time to commit changes, keep the usual workflow:

git add .
git commit -m 'our awesome code'
git push origin master

Now, after a while, we want to pull the latest changes from the upstream:

git pull upstream master

You will probably have to merge files. Git is great in auto merging, but sometimes it can’t resolve conflicts independently. You will see which files need to be merged manually. Most IDEs have an interface for managing merge conflicts embedded.

After you finish merging, add and commit your changes as usual.

That’s it!

You also can chain several repositories one by one. For example, in CtrlTilde, the first project is always open-source, the next one (which is cloned from it) is paid, and the third level are all custom projects. So, every next project is, at its core, the extension of the previous one.