Hi All, Please stop replying to this thread. Now, dpkg-buildpackage succeeds to build two .deb packages but git is still damaged.
Edward On 18/12/2015, aitor_czr <[email protected]> wrote: > Hi Edward, > > On 12/17/2015 09:27 PM, Edward Bartolo <[email protected]> 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. >> Aborting >> >> AND: >> >> edbarx@edbarx-pc:~/netman$ git status >> On branch master >> Your branch is behind 'origin/master' by 1 commit, and can be >> fast-forwarded. >> (use "git pull" to update your local branch) >> Changes not staged for commit: >> (use "git add <file>..." to update what will be committed) >> (use "git checkout -- <file>..." to discard changes in working >> directory) >> >> modified: debian/README.Debian >> modified: debian/netman-gui.install >> modified: netman.lps >> >> Untracked files: >> (use "git add <file>..." to include in what will be committed) >> >> debian/netman-gui.postinst >> rules.diff >> >> no changes added to commit (use "git add" and/or "git commit -a") >> >> >> Any idea how I can proceed? > > > Your changes are "untraked". This means that they are not being watched. > So, you must type something like this: > > $ git add . > > before doing the commit: > > $ git commit --all > > HTH > > Aitor. > > _______________________________________________ Dng mailing list [email protected] https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
