Git Merge Accept All Incoming