project to create a "git pull" for class that intelligently solves or gives options to easily resolve merge conflicts
By chatting or signing in you agree to the Terms and chat-message logging (revocable in History).