Dear Marcel,
Thank you for the clarification, now it seems to work.
However, there is a strange problem. Here is what I did:
$ cd /Volumes/T3Data/CRAN/GIT/xps
$ git remote -v
origin g...@github.com:cstrato/xps.git (fetch)
origin g...@github.com:cstrato/xps.git (push)
upstream g...@git.bioconductor.org:packages/xps (fetch)
upstream g...@git.bioconductor.org:packages/xps (push)
$ git checkout master
Already on 'master'
Your branch is up-to-date with 'origin/master'.
$ git pull upstream master
Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (6/6), done.
remote: Total 6 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (6/6), done.
From git.bioconductor.org:packages/xps
* branch master -> FETCH_HEAD
* [new branch] master -> upstream/master
Auto-merging DESCRIPTION
CONFLICT (content): Merge conflict in DESCRIPTION
Automatic merge failed; fix conflicts and then commit the result.
$ git add -v DESCRIPTION
add 'DESCRIPTION'
$ git add -v NEWS
$ git commit -m "update for NEWS"
[master 4121457] update for NEWS
$ git push origin master
Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
Counting objects: 9, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.01 KiB | 0 bytes/s, done.
Total 9 (delta 6), reused 0 (delta 0)
remote: Resolving deltas: 100% (6/6), completed with 3 local objects.
To github.com:cstrato/xps.git
cf326be..4121457 master -> master
$ git pull upstream master
Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
From git.bioconductor.org:packages/xps
* branch master -> FETCH_HEAD
Already up-to-date.
$ git push upstream master
Enter passphrase for key '/Users/cstrato/.ssh/id_rsa':
Counting objects: 11, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (11/11), done.
Writing objects: 100% (11/11), 1.68 KiB | 0 bytes/s, done.
Total 11 (delta 8), reused 0 (delta 0)
To git.bioconductor.org:packages/xps
aae14d1..4121457 master -> master
It seems that there was a conflict with DESCRIPTION,
so I did again 'git add DESCRIPTION'
Now everything seems to be ok, but when looking at the
DESCRIPTION file in e.g. https://github.com/cstrato/xps
the first lines of DESCRIPTION looks as follows:
Package: xps
<<<<<<< HEAD
Version: 1.41.2
=======
Version: 1.41.0
>>>>>>> aae14d1351c754876880f9b50af9da70f80034ce
Should I keep this DESCRIPTION file or delete the additional lines or
update the DESCRIPTION file again?
Best regards,
Christian
_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel
