GIT merge main branch to custom branch back (using Tortoise GIT)

Scenario:

GIT merge custom branch back to main branch

Solution:

1. Commit or stash any uncommitted changes.
2. Right click -> Merge -> select main branch you want to merge in your custom branch -> OK.
3. If no conflict jump to #4 else open the conflict files(s) and merge changes manually (- (orange) are the ones getting deleted, + added and = same) -> Save -> Mark as resolved -> Reload -> should be empty if no more conflicts.
4. Commit  (if not auto committed).
5. Push changes.
6. Right click -> Merge -> select next main branch you want to merge in your custom branch.
7. Do #5.