To put it more clearly: There are a couple of guys working with a code and there's a common repo on a server.
I cloned the remote repo with both Giteye and SourceTree (two different clones). I edited the code cloned with SourceTree, committed the changes and pushed the changes back to the remote repo. Then some other people have made some changes in some parts of the program and I made changes in another part of the program in the Giteye-clone. Before committing I wanted to update the Giteye-clone, but pull shows that everything has changed and everything is in conflict whereas fetch shows that nothing has changed. I managed to do the changes using the SourceTree-repo - first pulling then manually merging from the Giteye-tree and then committing/pushing using the SourceTree. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/groups/opt_out.
