I just wanted to let you know that your post here is still helping folks!
I gained a lot of good info from it, and it allowed me to understand pulls
and fetches much more completely!
Thanks!
On Tuesday, September 3, 2013 at 8:22:28 AM UTC-4, Konstantin Khomoutov
wrote:
>
> On Mon, 2 Sep 2013
On Mon, Sep 02, 2013 at 09:59:43PM -0700, Juha Aaltonen wrote:
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
Truckload of thanks for the explanation.
It must have taken a lot of iron wire to bend it for me. :-)
--
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
I guess I described the problem.
I don't seem to be able to update my working tree from the remote repo
using Giteye.
The pull complains about masses of conflicts (even if I know that not that
much has changed) and
the fetch just says the SW is the same (nothing to merge).
Maybe the problem is
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
