Hi Anand,
I’m not sure if the configuration on your machine is compromised in some way,
but most likely everything is fine.
I tested the exact same commands as you have and it seems to have worked.
Steps:
10871 git clone https://github.com/PoisonAlien/maftools.git
10872 cd maftools
10873
Hi Anand,
The issue is the way you have updated your version numbers.
Note that the last commit on upstream/master was the release version bump where
your package has a version “1.9.0”. Please update the version to “1.9.1” and
try pushing after the merge. I’ve outlined the steps you should ta
Hi Nitesh,
I have checked my remotes, they are fine.
$ git remote -v
origin https://github.com/PoisonAlien/maftools.git (fetch)
origin https://github.com/PoisonAlien/maftools.git (push)
upstreamg...@git.bioconductor.org:packages/maftools.git (fetch)
upstreamg...@git.bioconducto
I need more information to help you.
Please check http://bioconductor.org/developers/how-to/git/faq/, #14
especially. And any others you may need.
> On Dec 17, 2018, at 12:46 PM, Anand MT wrote:
>
> Hi Nitesh,
>
> Yes, I have pulled from upstream but still the same issue.
>
> $ git pull up
Hi Nitesh,
Yes, I have pulled from upstream but still the same issue.
$ git pull upstream master
From git.bioconductor.org:packages/maftools
* branchmaster -> FETCH_HEAD
Already up to date.
$ git status
On branch devel
nothing to commit, working tree clean
$ git push upstream ma
Hi,
Have your tried the command mentioned in the error message
git pull
This is important.
Once that is done, “IF” you have merge conflicts, please do
http://bioconductor.org/developers/how-to/git/resolve-conflicts/
Best,
Nitesh
> On Dec 17, 2018, at 10:22 AM, Anand MT
