[GH-ISSUE #342] Problem updating webvirtmgr #258

New issue

Closed

opened 2026-02-27 16:38:38 +03:00 by kerem · 1 comment

kerem commented

2026-02-27 16:38:38 +03:00

Owner

Originally created by @DEK4 on GitHub (Jun 18, 2014).
Original GitHub issue: https://github.com/retspen/webvirtmgr/issues/342

Hi!
I try to update my webvirt but I receive this error:

From git://github.com/retspen/webvirtmgr
e1c0fdd..638b9d7 master -> origin/master

[new branch] dev-manage -> origin/dev-manage
Updating e1c0fdd..638b9d7
error: Your local changes to the following files would be overwritten by merge:
webvirtmgr/settings.py
Please, commit your changes or stash them before you can merge.
Aborting

Thanks

Originally created by @DEK4 on GitHub (Jun 18, 2014). Original GitHub issue: https://github.com/retspen/webvirtmgr/issues/342 Hi! I try to update my webvirt but I receive this error: From git://github.com/retspen/webvirtmgr e1c0fdd..638b9d7 master -> origin/master - [new branch] dev-manage -> origin/dev-manage Updating e1c0fdd..638b9d7 error: Your local changes to the following files would be overwritten by merge: webvirtmgr/settings.py Please, commit your changes or stash them before you can merge. Aborting Thanks

kerem closed this issue

2026-02-27 16:38:38 +03:00

kerem commented

2026-02-27 16:38:38 +03:00

Author

Owner

@retspen commented on GitHub (Jun 18, 2014):

You can backup your settings.py and then git checkout webvirtmgr/settings.py after that git pull

@retspen commented on GitHub (Jun 18, 2014): You can backup your settings.py and then <code>git checkout webvirtmgr/settings.py</code> after that <code>git pull</code>

kerem referenced this issue

2026-02-27 16:39:51 +03:00

[PR #258] [MERGED] Fix #257 #600