On Thu, Dec 17, 2015 at 08:05:16PM +0100, Edward Bartolo wrote:
> Hi,
>
> Running "git pull" complains with the following message:
>

> edbarx@edbarx-pc:~/netman$ git pull
> Updating 06507b0..ddcd272
> error: Your local changes to the following files would be overwritten by merge:
>         debian/README.Debian
>         debian/netman-gui.install
> Please, commit your changes or stash them before you can merge.

^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^


> Any idea how I can proceed?


What about start reading the messages you get, for example? git is
literally saying you that "your local changes to the files
debian/README.Debian and debian/netman-gui.install would be
overwritten by a merge, so what you should do is to commit the changes
you have made to those files, and then merge, if you want them to
become effective".

In other words, you should stage the changes you made on those files
(git stage), then make a commit (git commit) and then perform a merge
(git merge). If you don't want your changes to become effective, you
can stash them instead of staging them. After either of those
operations, you should be able to perform a pull, and then a push.

My2Cents

KatolaZ

--
[ Enzo Nicosia aka KatolaZ --- GLUG Catania -- Freaknet Medialab ]
[ me [at] katolaz.homeunix.net -- http://katolaz.homeunix.net -- ]
[ GNU/Linux User:#325780/ICQ UIN: #258332181/GPG key ID 0B5F062F ]
[ Fingerprint: 8E59 D6AA 445E FDB4 A153 3D5A 5F20 B3AE 0B5F 062F ]