Package Details: grive-git 421.a756414-1

Git Clone URL: https://aur.archlinux.org/grive-git.git (read-only)
Package Base: grive-git
Description: An open source Linux client for Google Drive with support for the new Drive REST API and partial sync
Upstream URL: https://github.com/vitalif/grive2
Keywords: drive git Google share sync
Licenses: GPL2
Conflicts: grive
Provides: grive=421.a756414
Submitter: ilpianista
Maintainer: edh
Last Packager: edh
Votes: 69
Popularity: 0.875813
First Submitted: 2012-04-29 15:20
Last Updated: 2016-08-09 09:45

Required by (1)

Sources (1)

Latest Comments

edh commented on 2015-10-23 22:25

@justinkb
Thanks for the hint. I will update it in a couple of minutes.

semeion commented on 2015-10-23 22:20

@justinkb: Exactly. I got same error here. Recompiling the AUR package solve the problem.

justinkb commented on 2015-10-23 22:14

Maybe do a revbump since boost-libs pkg update from [extra] from a week or two ago means rebuilding this package is necessary

(grive: error while loading shared libraries: libboost_program_options.so.1.58.0: cannot open shared object file: No such file or directory)

edh commented on 2015-06-28 11:39

The concerning bug has been fixed upstream and I can confirm that it is working.

edh commented on 2015-06-26 14:48

There seems to be a problem concerning the build of some test units. I reported the error upstream!
The good news is that it only occurs when the package "cppunit" is installed: Removing the package, removes the error.
This definitely is not a permanent solution but for now "cppunit" is considered a conflicting package.

@jorges Thanks for your comment!

edh commented on 2015-06-26 14:47

There seems to be a problem concerning the build of some test units. I reported the error upstream!
The good news is that it only occurs when the package "cppunit" is installed: Removing the package, removes the error.
This definitely is not a permanent solution but for now "cppunit" is considered a conflicting package.

edh commented on 2015-06-26 14:46

There seems to be a problem concerning the build of some test units. I reported the error upstream! The good news is that it only occurs when the package "cppunit" is installed: Removing the package, removes the error. This definitely is not a permanent solution but for now "cppunit" is considered a conflicting package.

jorges commented on 2015-06-26 13:29

Build failing here, see below for excerpt

Linking CXX executable btest
[ 81%] Built target btest
Scanning dependencies of target unittest
[ 83%] Building CXX object libgrive/CMakeFiles/unittest.dir/test/UnitTest.cc.o
[ 85%] Building CXX object libgrive/CMakeFiles/unittest.dir/test/drive/EntryTest.cc.o
/var/abs/local/yaourt/tmp/yaourt-tmp-jscandal/aur-grive-git/src/grive-git/libgrive/test/drive/EntryTest.cc:24:26: fatal error: drive/Entry.hh: No such file or directory
compilation terminated.
libgrive/CMakeFiles/unittest.dir/build.make:77: recipe for target 'libgrive/CMakeFiles/unittest.dir/test/drive/EntryTest.cc.o' failed
make[2]: *** [libgrive/CMakeFiles/unittest.dir/test/drive/EntryTest.cc.o] Error 1
CMakeFiles/Makefile2:149: recipe for target 'libgrive/CMakeFiles/unittest.dir/all' failed
make[1]: *** [libgrive/CMakeFiles/unittest.dir/all] Error 2
Makefile:116: recipe for target 'all' failed
make: *** [all] Error 2
==> ERROR: A failure occurred in build().
Aborting...
==> ERROR: Makepkg was unable to build grive-git.

edh commented on 2015-06-01 13:37

I just obtained maintainership and will update this package from now on.
The PKGBUILD now uses a different source. To be precise it uses a fork of the original grive programm which was also introced in the grive package. This does not only fixes several bugs, e.g. the missing implementation of the new REST API, but moreover promises a much cleaner and better implementation of the new APIs.

tmoore commented on 2015-02-01 22:35

Updated and working

gosella commented on 2014-12-16 16:06

Please, update the patch file "json-c.patch" with this:

http://linkode.org/GolkssnklWcMlrBExxUr17

The first part of the patch is no longer relevant (and is causing trouble appling it, as reported by @frabjous).

Thanks!

frabjous commented on 2014-12-10 03:28


This may be related to filinep's problem but I currently cannot build this. I get:

build.sh cmake CMakeLists.txt COPYING grive grive.spec libgrive package README scripts
/tmp/pacaurtmp-kck/grive-git/src/grive-git
patching file cmake/Modules/FindJSONC.cmake
Hunk #1 FAILED at 6.
1 out of 1 hunk FAILED -- saving rejects to file cmake/Modules/FindJSONC.cmake.rej
patching file libgrive/src/protocol/Json.cc
Hunk #1 succeeded at 29 with fuzz 2.

filinep commented on 2014-11-27 08:35

I had to remove the first part of the json-c.patch file to get it to compile.

allencch commented on 2014-09-25 02:55

Another patch is required (https://github.com/Grive/grive/issues/193):

=====================
--- a/libgrive/src/drive/State.cc
+++ b/libgrive/src/drive/State.cc
@@ -248,12 +248,12 @@
void State::Write( const fs::path& filename ) const
{
Json last_sync ;
- last_sync.Add( "sec", Json(m_last_sync.Sec() ) );
- last_sync.Add( "nsec", Json(m_last_sync.NanoSec() ) );
+ last_sync.Add( "sec", Json((boost::uint64_t)m_last_sync.Sec() ) );
+ last_sync.Add( "nsec", Json((boost::uint64_t)m_last_sync.NanoSec() ) );

Json result ;
result.Add( "last_sync", last_sync ) ;
- result.Add( "change_stamp", Json(m_cstamp) ) ;
+ result.Add( "change_stamp", Json((boost::uint64_t)m_cstamp) ) ;

std::ofstream fs( filename.string().c_str() ) ;
fs << result ;
==============

axper commented on 2014-05-31 14:35

@ksj
Sounds like very upstream bug.

ksj commented on 2014-05-31 14:31

Hello,
I got following error, when I tried to run "grive -a" (after enter the auth code):

exception: /tmp/yaourt-tmp-ksj/aur-grive-git/src/grive-git/libgrive/src/protocol/Json.cc(231): Throw in function gr::Json gr::Json::operator[](const string&) const
Dynamic exception type: N5boost16exception_detail10clone_implIN2gr4Json5ErrorEEE
[PN2gr11KeyNotFoundE] = access_token
[PN2gr4expt12BacktraceTagE] = #0 0x488f3c grive gr::Exception::Exception()
#1 0x4740d1 grive gr::Json::Error::Error()
#2 0x472612 grive gr::Json::operator[](std::string const&) const
#3 0x47d072 grive gr::OAuth2::Auth(std::string const&)
#4 0x43d830 grive Main(int, char**)
#5 0x43b8bb grive main
#6 0x7f05c28b8000 /usr/lib/libc.so.6 __libc_start_main
#7 0x43c86f grive

[PN2gr7JsonTagE] = { "error": "invalid_grant", "error_description": "Invalid code." }
[PN2gr8JsonCApiE] = json_object_object_get

What I have to do to run code correctly?

J-Wreck commented on 2014-05-29 00:23

new PKGBUILD w/ gosella's patch (and a new, more active upstream git source) released. Also, converted PKGBUILD to modern VCS format.

gosella commented on 2014-05-28 22:35

I've created a patch to fix the changes introduced with the json-c update.
It basically changes all include files from <json/...> to <json-c/...>.

The modified PKGBUILD:
http://pastebin.com/m9Mc8ngt

The PKGBUILD also needs a patch file that must be named "json-c.patch":
http://pastebin.com/b87P3TTt

Hope it helps!

mrbit commented on 2014-05-28 10:08

After json-c update to 0.12-2, the package cannot be compiled because cmake fails to find JSON-C.

J-Wreck commented on 2013-06-19 17:16

Odd, using the ljson-c flag builds fine in a clean chroot for me...

hongy19 commented on 2013-06-19 14:19

I also need to change "ljson-c" to "ljson" in order to solve missing "ljson-c" issue.

PKGBUILD
-DCMAKE_EXE_LINKER_FLAGS=-ljson-c

hongy19 commented on 2013-06-19 01:21

this scrip also need qt4 for compile?

J-Wreck commented on 2013-06-18 14:53

Should be fixed now

Anonymous comment on 2013-06-18 08:00

Still getting errors when trying to build.

Fixed one by installing yajl

Fixed another by adding the lines

#define PACKAGE "grive"
#define PACKAGE_VERSION "git"

to libgrive/src/bfd/SymbolInfo.cc as suggested by bananaoomarang

The current error I'm receiving is:

-- Installing: /home/niksko/AUR/grive-git/pkg/grive-git/usr/bin/bgrive
CMake Error at bgrive/cmake_install.cmake:52 (FILE):
file INSTALL cannot find
"/home/niksko/AUR/grive-git/src/grive/bgrive/doc/grive.1".
Call Stack (most recent call first):
cmake_install.cmake:39 (INCLUDE)


make: *** [install] Error 1
==> ERROR: A failure occurred in package().
Aborting...

dobo commented on 2013-06-17 13:38

If it doesn't compile try this workaround
https://gist.github.com/dobo90/5796923

J-Wreck commented on 2013-01-29 17:24

@mountpeaks, are you building with the latest sources? It builds fine for me

tastyminerals commented on 2013-01-28 21:56

[ 95%] Building CXX object libgrive/CMakeFiles/unittest.dir/test/util/ConfigTest.cc.o
/tmp/yaourt-tmp-tasty-minerals/aur-grive-git/src/grive/libgrive/test/util/ConfigTest.cc:39:44: error: no ‘void grut::ConfigTest::TestInitialiseWithNoPath()’ member function declared in class ‘grut::ConfigTest’
/tmp/yaourt-tmp-tasty-minerals/aur-grive-git/src/grive/libgrive/test/util/ConfigTest.cc:48:42: error: no ‘void grut::ConfigTest::TestInitialiseWithPath()’ member function declared in class ‘grut::ConfigTest’
make[2]: *** [libgrive/CMakeFiles/unittest.dir/test/util/ConfigTest.cc.o] Error 1
make[1]: *** [libgrive/CMakeFiles/unittest.dir/all] Error 2
make: *** [all] Error 2
==> ERROR: A failure occurred in build().
Aborting...
==> ERROR: Makepkg was unable to build grive-git.
==> Restart building grive-git ? [y/N]

J-Wreck commented on 2012-12-11 01:00

As of the last update (Dec 6), the package should build fine.

bananaoomarang commented on 2012-12-10 20:33

@temoto

I just figured out a patch to get it to build on my box, just a couple of small problems. Seems to work now.

http://pastebin.com/Df4HPnL1

bananaoomarang commented on 2012-12-10 17:47

@temoto

Fixed by adding:

#define PACKAGE "grive"
#define PACKAGE_VERSION "git"

To the offending SymbolInfo.cc file.

http://stackoverflow.com/questions/11748035/binutils-bfd-h-wants-config-h-now

temoto commented on 2012-11-22 10:46


Build fail log:
https://gist.github.com/4130520

==> Determining latest git revision...
-> Version found: 20121122
...
[ 70%] Building CXX object libgrive/CMakeFiles/grive.dir/src/xml/Node.cc.o
[ 72%] Building CXX object libgrive/CMakeFiles/grive.dir/src/bfd/SymbolInfo.cc.o
In file included from /tmp/pacaurtmp-temoto/grive-git/src/grive/libgrive/src/bfd/SymbolInfo.cc:25:0:
/usr/include/bfd.h:37:2: error: #error config.h must be included before this header
make[2]: *** [libgrive/CMakeFiles/grive.dir/src/bfd/SymbolInfo.cc.o] Error 1
make[1]: *** [libgrive/CMakeFiles/grive.dir/all] Error 2
make: *** [all] Error 2

bananagranola commented on 2012-11-02 00:27

I modified the PKGBUILD here https://github.com/bananagranola/dotfiles/blob/master/.sources/grive-git/PKGBUILD to address https://github.com/Grive/grive/issues/72 by adding "sed -i -e '/find_package(BFD)/d' "${srcdir}"/grive/libgrive/CMakeLists.txt" before make. I also added cppunit to the conflicting packages list because doing so fixes zhobbs' problem (hacky, but temporarily works as long as you're not doing unit tests).

bananagranola commented on 2012-11-02 00:25

I modified the PKGBUILD to address this issue https://github.com/Grive/grive/issues/72 by adding https://github.com/Grive/grive/issues/72 before make. I also added cppunit to the conflicting packages because getting rid of it fixed zhobbs' problem below (hacky, but it works for now). It's uploaded here: https://github.com/bananagranola/dotfiles/blob/master/.sources/grive-git/PKGBUILD.

mrbit commented on 2012-09-14 16:20

fix:
https://github.com/mrpdaemon/grive/commit/a145c2041260be264069cdeb0cd4968afcee9035

dlin commented on 2012-09-04 03:42

jwooton & zhobbs:
I re-produce your problem.
That's caused by wrong choose.

rm /tmp/yaourt-tmp-<yourname>

The sources of grive-git were kept last time. Use them ? [Y/n]

You should reply 'N' here.

dlin commented on 2012-09-04 03:37

I know the problem, but, don't know how to correct it.

jwooton & zhobbs's method:
yaourt -S grive-git

My workable method:
cd /var/abs/local
yaourt -G grive-git
cd grive-git
makepkg

Anonymous comment on 2012-09-04 02:29

I get the same results as zhobbs...see below. But I am able to install the older version from the AUR: grive 0.2.0-38 . Unfortunately that version not up to date and behaving properly.

$ uname -a
Linux dadacomputer 3.5.3-1-ARCH #1 SMP PREEMPT Sun Aug 26 09:14:51 CEST 2012 x86_64 GNU/Linux

$ gcc --version
gcc (GCC) 4.7.1 20120721 (prerelease)
Copyright (C) 2012 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

$ pwd && git show
/tmp/yaourt-tmp-root/aur-grive-git/src/grive
commit 113b1107d8172ade8a6141735e8883bd3d64fe50
Merge: 804fe92 29f1739
Author: Nestal Wan <me@nestal.net>
Date: Mon Aug 6 07:51:57 2012 -0700

Merge pull request #112 from justinharding/issue_86_partial_sync

fix broken unit tests



[ 91%] Building CXX object libgrive/CMakeFiles/unittest.dir/test/util/FunctionTest.cc.o
[ 93%] Building CXX object libgrive/CMakeFiles/unittest.dir/test/util/DateTimeTest.cc.o
[ 95%] Building CXX object libgrive/CMakeFiles/unittest.dir/test/util/ConfigTest.cc.o
/tmp/yaourt-tmp-root/aur-grive-git/src/grive/libgrive/test/util/ConfigTest.cc:39:44: error: no 'void grut::ConfigTest::TestInitialiseWithNoPath()' member function declared in class 'grut::ConfigTest'
/tmp/yaourt-tmp-root/aur-grive-git/src/grive/libgrive/test/util/ConfigTest.cc:48:42: error: no 'void grut::ConfigTest::TestInitialiseWithPath()' member function declared in class 'grut::ConfigTest'
make[2]: *** [libgrive/CMakeFiles/unittest.dir/test/util/ConfigTest.cc.o] Error 1
make[1]: *** [libgrive/CMakeFiles/unittest.dir/all] Error 2
make: *** [all] Error 2
==> ERROR: A failure occurred in build().
Aborting...
==> ERROR: Makepkg was unable to build grive-git.
==> Restart building grive-git ? [y/N]
==> ----------------------------------

dlin commented on 2012-08-21 09:16

zhobbs,
I just makepkg, it workable. Maybe it's your environment problem, check:

$uname -a
Linux u40 3.4.9-1-ARCH #1 SMP PREEMPT Wed Aug 15 18:59:31 CEST 2012 x86_64 GNU/Linux

$ gcc --version
gcc (GCC) 4.7.1 20120721 (prerelease)

$ git show
commit 113b1107d8172ade8a6141735e8883bd3d64fe50

Anonymous comment on 2012-08-21 05:20

I get this:


[ 93%] Building CXX object libgrive/CMakeFiles/unittest.dir/test/util/DateTimeTest.cc.o
[ 95%] Building CXX object libgrive/CMakeFiles/unittest.dir/test/util/ConfigTest.cc.o
/tmp/grive-git/src/grive/libgrive/test/util/ConfigTest.cc:39:44: error: no ‘void grut::ConfigTest::TestInitialiseWithNoPath()’ member function declared in class ‘grut::ConfigTest’
/tmp/grive-git/src/grive/libgrive/test/util/ConfigTest.cc:48:42: error: no ‘void grut::ConfigTest::TestInitialiseWithPath()’ member function declared in class ‘grut::ConfigTest’
make[2]: *** [libgrive/CMakeFiles/unittest.dir/test/util/ConfigTest.cc.o] Error 1
make[1]: *** [libgrive/CMakeFiles/unittest.dir/all] Error 2
make: *** [all] Error 2
==> ERROR: A failure occurred in build().
Aborting...

TingPing commented on 2012-08-10 01:42

Working pkgbuild - https://raw.github.com/gist/3310164/a7333fd4b45a38f4d9ac3e3b624b107a4e261d71/PKGBUILD

dlin commented on 2012-08-10 01:02

lqs,
I've tested today, it workable, fixing is not necessary.

lqs commented on 2012-08-09 08:40

The requested URL returned error:
403 Forbidden while accessing https://github.com/Grive/grive.git/info/refs

So what address is availuable now?
Anyone help?

dlin commented on 2012-07-18 01:13

from:maintainer, Please remove old comment if that issue have fixed.
20120718 fixed license & download url to https

ilpianista commented on 2012-06-26 23:16

* orphaning

oliva commented on 2012-06-26 12:20

fails to work (download files for first time, first file done, but second fails)


exception: /tmp/yaourt-tmp-oliva/aur-grive-git/src/grive/libgrive/src/http/CurlAgent.cc(149): Throw in function long int gr::http::CurlAgent::ExecCurl(const string&, gr::http::Receivable*, const gr::http::Header&)
Dynamic exception type: boost::exception_detail::clone_impl<gr::http::Error>
std::exception::what: std::exception
[gr::expt::BacktraceTag*] = #0 0x462119 grive gr::Exception::Exception()
#1 0x458349 grive gr::http::Error::Error()
#2 0x4578b6 grive gr::http::CurlAgent::ExecCurl(std::string const&, gr::http::Receivable*, gr::http::Header const&)
#3 0x457cbd grive gr::http::CurlAgent::Get(std::string const&, gr::http::Receivable*, gr::http::Header const&)
#4 0x453930 grive gr::Drive::UpdateChangeStamp(gr::http::Agent*)
#5 0x453cb7 grive gr::Drive::Update()
#6 0x42f6d5 grive Main(int, char**)
#7 0x42dafb grive main
#8 0x7fb5b9cb8455 /lib/libc.so.6 __libc_start_main
#9 0x42e721 grive

[gr::expt::MsgTag*] =
[gr::http::CurlCodeTag*] = 0
[gr::http::HttpResponseTag*] = 400
[gr::http::UrlTag*] = https://docs.google.com/feeds/default/private/changes?start-index=0
[gr::http::HeaderTag*] = Authorization: Bearer ya29.AHES6ZRiEXNrHPYZhCcw23PnehmyeMuJIZtCmGrsGsXPT4dQPsDW3g

muunleit commented on 2012-06-18 16:12

It seems grive has moved again https://github.com/Grive/grive

mrbit commented on 2012-06-10 21:33

grive-git/src/grive/libgrive/src/protocol/OAuth2.cc:67:36: error: no matching function for call to ‘gr::http::CurlAgent::Post(const string&, std::string&, gr::http::JsonResponse*)’
not compila...

ilpianista commented on 2012-06-09 14:53

@gnomeye
thanks, the url is changed.

eyenx commented on 2012-06-09 14:45

anyone else getting a 404 trying to get to http://match065.github.com/grive ?

crobe2 commented on 2012-06-08 07:04

The current version does not work for me, grive authenticates, but does not create its state files, so it wants to initialize again on the next run.

ilpianista commented on 2012-05-30 14:54

@ctarwater
openssl is already installed by ca-certificates, which is needed by curl.
I haven't libstdc++5 on my system, and grive-git builds fine.

ctarwater commented on 2012-05-30 02:32

Thanks for maintaining this package!
I had to add 'libstdc++5' and 'openssl' in order to get this to compile and install/run properly. Once installed I created a new directory, cd-ed into it and ran 'grive-a' without any issues.

Anonymous comment on 2012-05-24 04:36

Same error as gdw and palpinter received.

ilpianista commented on 2012-05-23 17:39

Report the bug upstream!

palpinter commented on 2012-05-23 17:38

Does'nt work properly:


/tmp/yaourt-tmp-palpinter/aur-grive-git/src/grive/libgrive/src/util/Gdbm.cc: In constructor ‘gr::Gdbm::Gdbm(const string&)’:
/tmp/yaourt-tmp-palpinter/aur-grive-git/src/grive/libgrive/src/util/Gdbm.cc:39:78: error: invalid conversion from ‘void (*)()’ to ‘void (*)(const char*)’ [-fpermissive]
In file included from /tmp/yaourt-tmp-palpinter/aur-grive-git/src/grive/libgrive/src/util/Gdbm.cc:24:0:
/usr/include/gdbm.h:101:18: error: initializing argument 5 of ‘gdbm_file_info* gdbm_open(const char*, int, int, int, void (*)(const char*))’ [-fpermissive]
/tmp/yaourt-tmp-palpinter/aur-grive-git/src/grive/libgrive/src/util/Gdbm.cc:42:39: error: invalid conversion from ‘const char*’ to ‘char*’ [-fpermissive]
make[2]: *** [libgrive/CMakeFiles/grive.dir/src/util/Gdbm.cc.o] Error 1
make[1]: *** [libgrive/CMakeFiles/grive.dir/all] Error 2
make: *** [all] Error 2

gdw commented on 2012-05-23 16:40

Doesn't compile for me:

/tmp/yaourt-tmp-gwarner/aur-grive-git/src/grive/libgrive/src/util/Gdbm.cc: In constructor 'gr::Gdbm::Gdbm(const string&)':
/tmp/yaourt-tmp-gwarner/aur-grive-git/src/grive/libgrive/src/util/Gdbm.cc:39:78: error: invalid conversion from 'void (*)()' to 'void (*)(const char*)' [-fpermissive]
In file included from /tmp/yaourt-tmp-gwarner/aur-grive-git/src/grive/libgrive/src/util/Gdbm.cc:24:0:
/usr/include/gdbm.h:101:18: error: initializing argument 5 of 'gdbm_file_info* gdbm_open(const char*, int, int, int, void (*)(const char*))' [-fpermissive]
/tmp/yaourt-tmp-gwarner/aur-grive-git/src/grive/libgrive/src/util/Gdbm.cc:42:39: error: invalid conversion from 'const char*' to 'char*' [-fpermissive]
make[2]: *** [libgrive/CMakeFiles/grive.dir/src/util/Gdbm.cc.o] Error 1
make[1]: *** [libgrive/CMakeFiles/grive.dir/all] Error 2
make: *** [all] Error 2

ilpianista commented on 2012-05-17 18:01

@kammela
Report the bug upstream

Anonymous comment on 2012-05-17 17:37

I have a error when first start grive

[kammela@archp .grive]$ grive -a
terminate called after throwing an instance of 'gr::Config::Error'
what(): std::exception
Annullato

Anonymous comment on 2012-05-07 12:49

doesn't work for me too, same behaviour as reported by HarD

HarD commented on 2012-05-06 18:16

I have a error when start grive

grive -a
*** glibc detected *** grive: double free or corruption (top): 0x00000000013de1c0 ***
======= Backtrace: =========
/lib/libc.so.6(+0x78a56)[0x7fbd81c06a56]
/usr/lib/libcurl.so.4(+0x1ca54)[0x7fbd81732a54]
/usr/lib/libgrive.so.0(_ZN2gr4http5Agent6EscapeERKSs+0x4d)[0x7fbd82461d8d]
/usr/lib/libgrive.so.0(_ZN2gr6OAuth211MakeAuthURLERKSsS2_+0x81)[0x7fbd82462151]
grive(main+0x80)[0x4028b0]
/lib/libc.so.6(__libc_start_main+0xf5)[0x7fbd81baf455]
grive[0x4031e1]
======= Memory map: ========

ilpianista commented on 2012-04-29 22:14

@mrbit
Works for me. Try again

mrbit commented on 2012-04-29 22:13

==> Connecting to GIT server....
remote: Counting objects: 53, done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 38 (delta 23), reused 36 (delta 21)
Unpacking objects: 100% (38/38), done.
From https://github.com/match065/grive
74d6b56..60f1e87 master -> origin/master
Updating 74d6b56..60f1e87
error: Your local changes to the following files would be overwritten by merge:
src/main.cc
Please, commit your changes or stash them before you can merge.
Aborting
==> ERRORE: