Re: [git-users] rsync instead of git clone and merging
Merci ! On Wed, Mar 26, 2014 at 5:48 PM, Jean-Rene David git-us...@levelnine.netwrote: * 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 other, you need to make that explicit. So let's say we call your local repo 'local-tgv' and your remote repo 'remote-tgv'. If you want to pull changes from remote-tgv into local-tgv, you need to first tell git: ~/tgv $ cd ~/tgv ~/tgv $ git remote add remote-tgv ~/giga/tgv Now that it has a name, you can fetch the content of remote-tgv: ~/tgv $ git fetch remote-tgv Now you should be able to see the branches in remote-tgv while in local-tgv by typing: ~/tgv $ git branch -a * master remotes/remote-tgv/master (I'm assuming the branch in local-tgv and remote-tgv are both named 'master'. It's the default branch name.) And finally you can merge. ~/tgv $ git merge remote-tgv/master -- JR -- You received this message because you are subscribed to a topic in the Google Groups Git for human beings group. To unsubscribe from this topic, visit https://groups.google.com/d/topic/git-users/2i2cxe8TaaU/unsubscribe. To unsubscribe from this group and all its topics, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout. -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
[git-users] rsync instead of git clone and merging
Hello , I'm a Git newbie. I could not get a clone onto the server directly via SSH, so I rsync it and continued to work as usual. I've done commits on both, added different files and directories on both repositories, and felt that it was time to merge. However, now that I would like to now merge the repository on the cluster, with the one on my computer, git complains that both repositories are masters, which in hindsight seems obvious since I did not create branch. I would greatly appreciate any help on how to merge the two. My laptop is a macbook pro running git version 1.8.5.2 (Apple Git-48), the cluster has git version 1.7.1. Thanks ! -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] rsync instead of git clone and merging
* 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, exactly? Exact quotes will get you better answers than paraphrased error messages. -- JR -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] rsync instead of git clone and merging
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 for commit: (use git add file... to update what will be committed) (use git checkout -- file... to discard changes in working directory) modified: sequencing/RNAseq/deseq.R Remote git repository : gmol16:tgv rjgularte$ git status On branch master Changes to be committed: (use git reset HEAD file... to unstage) renamed:sequencing/bam.sort.slq - sequencing/DNAseq/bam.sort.slq renamed:sequencing/bwa.map.q - sequencing/DNAseq/bwa.map.q renamed:sequencing/bwa.map.slq - sequencing/DNAseq/bwa.map.slq renamed:sequencing/fix.headers.txt - sequencing/DNAseq/fix.headers.txt renamed:sequencing/gatk.pp.q - sequencing/DNAseq/gatk.pp.q renamed:sequencing/gatk.pp.slq - sequencing/DNAseq/gatk.pp.slq renamed:sequencing/gatk.ug.q - sequencing/DNAseq/gatk.ug.q renamed:sequencing/order.list - sequencing/DNAseq/order.list renamed:sequencing/ref.index.q - sequencing/DNAseq/ref.index.q renamed:sequencing/vcf.select.sh - sequencing/DNAseq/vcf.select.sh renamed:sequencing/vcf2bed.R - sequencing/DNAseq/vcf2bed.R renamed:sequencing/cuff.analysis.slq - sequencing/RNAseq/cuff.analysis.slq renamed:sequencing/deseq.R - sequencing/RNAseq/deseq.R renamed:sequencing/idx_htseq.slq - sequencing/RNAseq/idx_htseq.slq renamed:sequencing/rna.metrics.R - sequencing/RNAseq/rna.metrics.R renamed:sequencing/tophat.map.slq - sequencing/RNAseq/tophat.map.slq deleted:sequencing/mm9.size.txt Changes not staged for commit: (use git add/rm file... to update what will be committed) (use git checkout -- file... to discard changes in working directory) deleted:sequencing/DNAseq/bam.sort.slq deleted:sequencing/DNAseq/vcf2bed.R modified: sequencing/RNAseq/cuff.analysis.slq modified: sequencing/RNAseq/idx_htseq.slq modified: sequencing/RNAseq/tophat.map.slq gmol16:~ rjgularte$ cd giga/tgv/ gmol16:tgv rjgularte$ git merge ~/tgv/ merge: /Users/rjgularte/tgv/ - not something we can merge gmol16:tgv rjgularte$ git pull ~/tgv/ error: refs/remotes/svn/tags/em_genotypes does not point to a valid object! From /Users/rjgularte/tgv * branchHEAD - FETCH_HEAD Already up-to-date. gmol16:tgv rjgularte$ -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
Re: [git-users] rsync instead of git clone and merging
* 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 other, you need to make that explicit. So let's say we call your local repo 'local-tgv' and your remote repo 'remote-tgv'. If you want to pull changes from remote-tgv into local-tgv, you need to first tell git: ~/tgv $ cd ~/tgv ~/tgv $ git remote add remote-tgv ~/giga/tgv Now that it has a name, you can fetch the content of remote-tgv: ~/tgv $ git fetch remote-tgv Now you should be able to see the branches in remote-tgv while in local-tgv by typing: ~/tgv $ git branch -a * master remotes/remote-tgv/master (I'm assuming the branch in local-tgv and remote-tgv are both named 'master'. It's the default branch name.) And finally you can merge. ~/tgv $ git merge remote-tgv/master -- JR -- 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 git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
