Content
i add new file to repository, he adds new file to repository i commit new changes, he commits new changes i push my commits, he has to resolve merge conflicts, great success
i add new file to repository, he adds new file to repository i commit new changes, he commits new changes i push my commits, he has to resolve merge conflicts, great success