Repository maintenance

[poonkuzhali]

Hello,

Can anyone provide any tips, information or best practices on how to maintain the code repository?

We are using this repository and customized it for our use case. But the problem is , the original Microsoft repository keeps getting new features and updates constantly. It is hard to replicate the changes. Any feedback on how others are doing it will be highly appreciated

[bnodir]

To maintain an updated and customized code repository, you can follow these steps:

1. Fork the original Microsoft repository:

   • This creates your own copy of the repository which you can modify without affecting the original.

2. Create a custom branch (e.g., custom-branch):

   • This allows you to work on your customization separately from the main branch.

3. Update your repository when the original gets new features:

   • Switch to the main branch: git checkout main
   • Pull updates from the original repository: git pull upstream main

4. Create a new branch for merging (e.g., custom-branch-updated):

   • Switch to your custom branch: git checkout custom-branch
   • Create the new branch: git checkout -b custom-branch-updated

5. Merge the main branch into your new branch:

   • Switch to the new branch: git checkout custom-branch-updated
   • Merge changes: git merge main
     NB: You may face merge conflicts during this step, and it is essential to resolve them carefully to ensure that both updates from the main branch and your custom changes are preserved.

Hope this helps!