Edward Bartolo <[email protected]> writes: > 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
[...] > Any idea how I can proceed? This depends on what you want to do. If you want to keep your local changes, you need to commit them before the pull. Committing something into git is a 2-stage process. First, the modified files need to be 'added' to the set of files to be committed, followed by committing them. You could do a summary commit, git commit -m 'recent work' -a This would add both modified files and afterwards commit them using 'recent work' as commit message. But using something more descriptive is a better idea. In case you're unsure what was changed, git diff can be used to display the changes. You can execute that either as git diff to get a listing of all changes or with an additional filename argument. Individual files can then be committed with git commit -m '<description>' -a /path/to/file (the -a means 'add before committing so a separate git add ... isn't needed). If you want to discard your changes, you can do so file-by-file with git checkout /path/to/file or summarily with git reset --hard _______________________________________________ Dng mailing list [email protected] https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/dng
