Re: [Bioc-devel] Issue when merging upstream current release branch

2020-11-12 Thread Kern, Lori
formatics Elm & Carlton Streets Buffalo, New York 14263 From: H�l�ne Borges Sent: Thursday, November 12, 2020 1:00 PM To: Kern, Lori Cc: bioc-devel@r-project.org Subject: Re: [Bioc-devel] Issue when merging upstream current release branch Yes, I have exact

Re: [Bioc-devel] Issue when merging upstream current release branch

2020-11-12 Thread Hélène Borges
Yes, I have exactly the output you suggest for the command git remote -v. Also, it worked making the command you suggested (git push origin RELEASE_3_12). To make things about versioning clear to me: - I have to push only to *origin/master* and *upstream/master *for the reviewers suggestions

Re: [Bioc-devel] Issue when merging upstream current release branch

2020-11-12 Thread Kern, Lori
To recap: It seem like you have created the RELEASE_3_12 branch that will track from upstream (Bioconductor's RELEASE_3_12 branch) as the following you said worked: git checkout -b RELEASE_3_12 upstream/RELEASE_3_12 So the following fails: git merge origin/RELEASE_3_12 merge: origin/RELEASE_3_