search

fridoling / sequencing

0 stars 0 forks source link

problems with push/pull from cluster #6

Open pilopilota opened 5 years ago

pilopilota commented 5 years ago

I modified main_bam_pipeline.sh to have some sentences in the log, and the bam quality check at the end. I'm having problems in push/pull from the cluster.

in my local machine I git add the file, then git commit, then git push. then I moved to the cluster and pulled, and I get the error: Your branch is ahead of 'origin/master' by 1 commit. modified: main_bam_pipeline.sh I tried again, maybe I did some mess. in the end I deleted main_bam_pipeline in the cluster and rsynced the whole /sequencing from my local to the cluster. I hope this is not a big deal. now the file on the cluster is the same as on my local machine, but still git pull returns the same error as above.

I did so to try the full pipeline on the cluster, I hope I did not mess up anything important...sorry about that

pilopilota commented 5 years ago

I renamed the old sequencing folder as sequencing_old and cloned again the git repository into a new sequencing folder. if there's nothing special into the old sequencing folder, we can delete it