Add a script to deal with merge conflicts

[Sync271]

What does this PR do?

• Add a python script that generates packages\apps\src\index.ts and packages\apps\package.json for potentially dealing with merge conflicts
• Remove cht-sh from apps as it gets triggered instead of the apps
• Add a shell script to handle the merge on master into main and run the python script before commit.

How to use?

Note: the following works if this PR is merged into master, or can merge any branch into any other branch if you change the branch name here: https://github.com/felvin-search/instant-apps/blob/4898720bb0a52a4addf38384248228ce14325a30/scripts/fix_merge_conflict.sh#L4

Step 1:

Find a PR with a merge conflict with file(s): yarn.lock / package.json / index.ts

Step 2:

run ./scripts/fix_merge_conflict.sh from the root

That should take care of merge conflicts and should make a local commit.

[hargup]

@Sync271 The aim of this is script is to help us resolve merge conflicts easily. Let's also add the other commands which are required to make this happen. You mentioned that we can use “ours” and “theirs” keywords on git that allow you to accept current or incoming changes.

[Sync271]

@hargup , alright, on it!