What practice can help reduce the chances of encountering a merge conflict?
Avoid frequent interaction with the remote repository to reduce the probability of pulling conflicts.
Keep local repository branches in sync with upstream branches in the remote repository by committing,pushing and pulling frequently.
make large commits that introduce multiple features.
Provide detailed commit messages that describe the changes being introduced by the commit.