Quote:
Originally Posted by dugan
|
I am aware of the git pull/git fetch,merge commands. However if you have a merge conflict then you have to do the changes to the file yourself.
And if something is done wrong here, then you don't have the exact repo contents as the original repo I forked from.
I tried something and pulled from his git repo. Then there were merge conflicts and for those files I copied the content as they are on his repo for these files.
However I don't know if this will keep my repo intact for future use (read as: I commit, push. Other git owner pulls and merges.)