Hi Tiago,
Let's take a look at the commit history you have,
/t/FCBF ❯❯❯ git log
commit 5b6ba9580a6d4a0fb1b7e2b2654d5e446ef89866
Merge: 654ec0d b3e7023
Author: Tiago Lubiana <tiagolubi...@hotmail.com>
Date: Fri May 3 17:12:23 2019 -0300
merging files
commit 654ec0d81126da3fef1adc00414e05a6d68ebc99
Merge: ad85281 95800f4
Author: Tiago Lubiana <tiagolubi...@hotmail.com>
Date: Fri May 3 17:09:39 2019 -0300
solving merge conflicts
commit ad8528134a07403753ca2e058255ffb294c8df7f
Merge: dadc48d 2e9e337
Author: Tiago Lubiana <tiagolubi...@hotmail.com>
Date: Fri May 3 17:08:40 2019 -0300
Correcting version
commit b3e7023ecde17cf34f4f7eec0b3a7b2f38ba7db3
Author: Nitesh Turaga <nitesh.tur...@gmail.com>
Date: Thu May 2 12:15:55 2019 -0400
bump x.y.z versions to odd y after creation of RELEASE_3_9 branch
commit 95800f4abe16f319973e75a59700f12de131d0d8
Author: Nitesh Turaga <nitesh.tur...@gmail.com>
Date: Thu May 2 11:54:13 2019 -0400
bump x.y.z versions to even y prior to creation of RELEASE_3_9 branch
There are some clear issues in the way you push your commits to the
git.bioconductor.org server. First of all, it seems that you are able to push
to the Bioc git server as the git log history shows. Please let me know what
changed since May 3rd? Are you working on a different computer with different
SSH keys?
Another worrying thing is your changes to the version numbers and the commits
which involve merge conflict markers. This should not be done.
You should be in the RELEASE_3_9 local copy of the branch,
git checkout -b RELEASE_3_9 upstream/RELEASE_3_9
<make changes>
<git commit changes>
git push upstream RELEASE_3_9
Best,
Nitesh
This email message may contain legally privileged and/or confidential
information. If you are not the intended recipient(s), or the employee or
agent responsible for the delivery of this message to the intended
recipient(s), you are hereby notified that any disclosure, copying,
distribution, or use of this email message is prohibited. If you have received
this message in error, please notify the sender immediately by e-mail and
delete this email message from your computer. Thank you.
_______________________________________________
Bioc-devel@r-project.org mailing list
https://stat.ethz.ch/mailman/listinfo/bioc-devel
