starred/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud.git synced 2026-04-26 07:55:52 +03:00
Code Issues 199 Projects Releases 1 Packages Wiki Activity

[GH-ISSUE #24] Update using git pull - Error #18

New issue
Closed
opened 2026-02-27 15:57:00 +03:00 by kerem · 2 comments
kerem commented 2026-02-27 15:57:00 +03:00
Owner
Copy link

Originally created by @ghost on GitHub (Jun 23, 2015).
Original GitHub issue: https://github.com/retspen/webvirtcloud/issues/24

Hi there!

I'm getting this error when I ran git pull....

Updating b8caf3f..7c5b606
error: Your local changes to the following files would be overwritten by merge:
webvirtcloud/settings.py
Please, commit your changes or stash them before you can merge.
Aborting

My settings.py was modified by myself with cert files, IP, etc.

Need I update this file? Is very important?

Thanks.

Originally created by @ghost on GitHub (Jun 23, 2015). Original GitHub issue: https://github.com/retspen/webvirtcloud/issues/24 Hi there! I'm getting this error when I ran git pull.... Updating b8caf3f..7c5b606 error: Your local changes to the following files would be overwritten by merge: webvirtcloud/settings.py Please, commit your changes or stash them before you can merge. Aborting My settings.py was modified by myself with cert files, IP, etc. Need I update this file? Is very important? Thanks.
kerem closed this issue 2026-02-27 15:57:00 +03:00
kerem commented 2026-02-27 15:57:00 +03:00
Author
Owner
Copy link

@retspen commented on GitHub (Jun 27, 2015):

Copy your settings, update and then restore. Thats update have a bit fix.

<!-- gh-comment-id:116047499 --> @retspen commented on GitHub (Jun 27, 2015): Copy your settings, update and then restore. Thats update have a bit fix.
kerem commented 2026-02-27 15:57:00 +03:00
Author
Owner
Copy link

@ghost commented on GitHub (Jun 27, 2015):

All right, that's done.

Thanks.

<!-- gh-comment-id:116092149 --> @ghost commented on GitHub (Jun 27, 2015): All right, that's done. Thanks.
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
master
v1.0
Labels
Clear labels   
bug

   
enhancement

   
pull-request

Mirrored from GitHub Pull Request

No labels
bug
enhancement
pull-request
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/webvirtcloud#18
No description provided.