grunt-git-deploy icon indicating copy to clipboard operation
grunt-git-deploy copied to clipboard

Published 20 hours ago • verified publisher icon iclanzan

Had a merge conflict after pulling in new changes

Open jrdn91 opened this issue 9 years ago • 0 comments

So the first time I ran this and cloned the new branch to my webserver it went great. However I made some more changes to the site, built it which they deploys it to the branch.

But this time when I went to where I had cloned the branch and did a git pull, I had a conflict error of some sort where I changed the file. As if it didn't completely remove all the files before trying to overwrite them.

When I viewed the files in the file browser I did not see the conflicts in the files, so I think it happens after I git pull on the server.

Do I need to do something more specific when cloning the branch and pulling in newly deployed changes?

jrdn91 avatar Feb 28 '15 20:02 jrdn91