Merci !
On Wed, Mar 26, 2014 at 5:48 PM, Jean-Rene David wrote:
> * Rodrigo Gularte Mérida [2014.03.26 12:25]:
> >[...]
> >gmol16:~ rjgularte$ cd giga/tgv/
> >gmol16:tgv rjgularte$ git merge ~/tgv/
> >merge: /Users/rjgularte/tgv/ - not something we can merge
>
> You can't directl
* Rodrigo Gularte Mérida [2014.03.26 12:25]:
>[...]
>gmol16:~ rjgularte$ cd giga/tgv/
>gmol16:tgv rjgularte$ git merge ~/tgv/
>merge: /Users/rjgularte/tgv/ - not something we can merge
You can't directly merge directories that way. If
you want your repositories to know about each
o
>
> Right! Both working repository are named tgv. One is at giga/tgv (the
> real master), and ~/tgv is a copy of the repository on the cluster. I
> copied them both to my laptop to work with them.
Local git repository :
gmol16:tgv rjgularte$ git status
On branch master
Changes not staged fo
* Rodrigo Gularte Mérida [2014.03.26 09:11]:
>[...]
>However, now that I would like to now merge
>the repository on the cluster, with the one
>on my computer
What command did you type, exactly?
>git complains that both repositories are
>masters
What message did you get, e
