Sorry, again a Digest in the Subject.

On 20/09/15 20:21, aitor_czr wrote:
Commit your changes doing:

$ git add .
$ git commit --all

After that, push the branch. You can use tags as backups, but keep in mind that when you extract a tag you will get a
disconnected HEAD. So, you will have to create a branch after that. Otherwise, 
you will lose all your changes.

Aitor.

On 20/09/15 00:09, Edward Bartolo <edb...@gmail.com> wrote:
Hi,

I added two useless files to netman that I want to remove: these are
netman.lpi and netman.lps.

What should I do? git is rejecting my changes like this:
$ git pull
error: Your local changes to the following files would be overwritten by merge:
        netman.lpi
        netman.lps
Please, commit your changes or stash them before you can merge.
Aborting

_______________________________________________
Dng mailing list
Dng@lists.dyne.org
https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng

Reply via email to