
Avoiding Merge Conflicts For Fork Projects
In my previous team, I’ve worked on a project which was actually a fork of another internal project at the parent company. A git fork project is very powerful in that the project maintains its connection to the original project. When there are new commits added to the original project, a fork project can simply…