Manual Solving Pull-Request Conflicts

There are instances where a DCS github user submits a Pull-Request from their Fork of the repository which cannot be Merged automatically. The steps below will identify one approach for a repository administrator to solve this problem. This approach requires that that...

Workflow Using SmartGit

Forking/Branching Workflow Before beginning this procedure, it is a good idea to remove all copies of the repository from your computer. If you are concerned you might lose something, you can alternately move all copies of the repository to a backup location where...