Pulling Master Branch Error

[ntfredo]

error: The following untracked working tree files would be overwritten by merge:
.Rbuildignore
.gitignore
ClimateObject.Rproj
Please move or remove them before you can merge.
Aborting

[Fshem]

May be this can help: git fetch --all, which fetches remote changes from all branches to local repository and it does not affect working directory.
You can also use git reset --hard origin/master if you want to remove uncommited changes from your working directory.

[ntfredo]

Thanks Fanuel. The first option wasn't working for me but the second worked well.

[ntfredo]

It seems like there is something wrong while pulling on the master branch. I am not sure what is going on. Any one who understand what is going on can help us. Here is the message I got:

error: The following untracked working tree files would be overwritten by merge:
R/ClimateMethods/DataManipulation/summary_statistics_method.R
Please move or remove them before you can merge.
Aborting

[AndreeMN]

Hi fredo,

You can go to your project directory and issue the command "git stash" in
the terminal.
See https://git-scm.com/book/en/v1/Git-Tools-Stashing
https://git-scm.com/book/en/v1/Git-Tools-Stashing

Hope this help.

Andree

On 23 June 2015 at 09:39, Frederic Ntirenganya [email protected]
wrote:

It seems like there is something wrong while pulling on the master branch.
I am not sure what is going on. Any one who understand what is going on can
help us. Here is the message I got:

error: The following untracked working tree files would be overwritten by
merge:
R/ClimateMethods/DataManipulation/summary_statistics_method.R
Please move or remove them before you can merge.
Aborting

—
Reply to this email directly or view it on GitHub
#23 (comment)
.

Regards,

Andree Mentho Nenkam
African Institutes for Mathematical Sciences, Ghana Meteorological
Agencies
email: [email protected], [email protected] [email protected]
facebook: Van Nenkam
contact: +233-542-288-380
"I have found a paradox, that if you love until it hurt, there can be no
more hurt, only more love." Mother Theresa