GitHub best practice

Fetch and Rebase (Preferred): Mandeep can fetch the latest changes from the master branch and rebase her branch on top of it. This ensures her branch has all the latest updates without unnecessary merge commits.
```
 # Fetch the latest changes from master
 git fetch origin

 # Switch to your branch
 git checkout mandeep

 # Rebase onto the latest master
 git rebase origin/master
```
During the rebase, if there are any conflicts, he will need to resolve them. After resolving, continue the rebase with:
```
 git rebase --continue
```
Finally, he can push her updated branch:
```
 git push --force
```
Merge Master into Her Branch (Alternative): If Mandeep is not comfortable with rebasing, he can merge the master branch into her branch. This approach creates a merge commit but achieves the same result of incorporating the latest code.
```
 # Fetch the latest changes from master
 git fetch origin

 # Switch to your branch
 git checkout mandeep

 # Merge master into her branch
 git merge origin/master
```
If there are conflicts, he will need to resolve them during the merge. After resolving, he can commit the merge and push her branch:
```
 git commit
 git push
```

Regularly Update Feature Branches: Encourage developers to periodically pull or rebase with the master branch during their work to minimize conflicts.
Feature Completion Checklist:
- Before creating a pull request, ensure the feature branch is up to date with master.
- Test the feature branch after updating with master to ensure compatibility.
Continuous Integration: Use a CI/CD pipeline to test merges automatically and catch issues early.

Using these practices, the team can work efficiently and reduce merge-related issues.