Hello
While updating ERPNext I m getting following error.
error: Your local changes to 'startup/__init__.py' would be overwritten by merge.
Aborting.
Please, commit your changes or stash them before you can merge.
–
Prasad
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un...@googlegroups.com.
To post to this group, send email to er...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
system
2
Hi Prakash
You must have done some changes in the startup init file.
If it is okay to lose those changes, you can use
git stash
Else read Git help to learn how to commit and merge changes.
Sent from my phone
Hello
While updating ERPNext I m getting following error.
error: Your local changes to 'startup/__init__.py' would be overwritten by merge.
Aborting.
Please, commit your changes or stash them before you can merge.
–
Prasad
–
You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un...@googlegroups.com.
To post to this group, send email to er...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
Hi Anand
Pl let me know how to open Git help.
--
Prasad
On Thu, Feb 28, 2013 at 1:31 PM, Anand Doshi
<an...@iwebnotes.com> wrote:
Hi Prakash
You must have done some changes in the startup init file.
If it is okay to lose those changes, you can use
git stash
Else read Git help to learn how to commit and merge changes.
Sent from my phone
On 28-Feb-2013, at 1:06 PM, Prasad Bandale <
pr…@gmail.com> wrote:
Hello
While updating ERPNext I m getting following error.
error: Your local changes to 'startup/init.py' would be overwritten by merge.
Aborting.
Please, commit your changes or stash them before you can merge.
–
Prasad
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un...@googlegroups.com.
To post to this group, send email to er...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
system
4
Hi Anand
Pl let me know how to open Git help.
--
Prasad
On Thu, Feb 28, 2013 at 1:31 PM, Anand Doshi
<an...@iwebnotes.com> wrote:
Hi Prakash
You must have done some changes in the startup init file.
If it is okay to lose those changes, you can use
git stash
Else read Git help to learn how to commit and merge changes.
Sent from my phone
On 28-Feb-2013, at 1:06 PM, Prasad Bandale <
pr…@gmail.com> wrote:
Hello
While updating ERPNext I m getting following error.
error: Your local changes to ‘startup/init.py’ would be overwritten by merge.
Aborting.
Please, commit your changes or stash them before you can merge.
–
Prasad
–
You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un...@googlegroups.com.
To post to this group, send email to er...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
Dear Anand
I m getting following error while executing git stash.
fatal: Not a git repository (or any of the parent directories): .git
Please let me know how to run git stash.
–
Prasad
On Thu, Feb 28, 2013 at 2:44 PM, Anand Doshi
<an…@iwebnotes.com> wrote:
Hi Anand
Pl let me know how to open Git help.
–
Prasad
On Thu, Feb 28, 2013 at 1:31 PM, Anand Doshi
<an…@iwebnotes.com> wrote:
Hi Prakash
You must have done some changes in the startup init file.
If it is okay to lose those changes, you can use
git stash
Else read Git help to learn how to commit and merge changes.
Sent from my phone
On 28-Feb-2013, at 1:06 PM, Prasad Bandale <
pr…@gmail.com> wrote:
Hello
While updating ERPNext I m getting following error.
error: Your local changes to 'startup/init.py' would be overwritten by merge.
Aborting.
Please, commit your changes or stash them before you can merge.
–
Prasad
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un...@googlegroups.com.
To post to this group, send email to er...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
system
6
Go to app folder and run
Git stash
Sent from my phone
Dear Anand
I m getting following error while executing git stash.
fatal: Not a git repository (or any of the parent directories): .git
Please let me know how to run git stash.
–
Prasad
On Thu, Feb 28, 2013 at 2:44 PM, Anand Doshi
<an…@iwebnotes.com> wrote:
Hi Anand
Pl let me know how to open Git help.
–
Prasad
On Thu, Feb 28, 2013 at 1:31 PM, Anand Doshi
<an…@iwebnotes.com> wrote:
Hi Prakash
You must have done some changes in the startup init file.
If it is okay to lose those changes, you can use
git stash
Else read Git help to learn how to commit and merge changes.
Sent from my phone
On 28-Feb-2013, at 1:06 PM, Prasad Bandale <
pr…@gmail.com> wrote:
Hello
While updating ERPNext I m getting following error.
error: Your local changes to ‘startup/init.py’ would be overwritten by merge.
Aborting.
Please, commit your changes or stash them before you can merge.
–
Prasad
–
You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups “ERPNext Developer Forum” group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un…@googlegroups.com.
To post to this group, send email to er…@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
–
You received this message because you are subscribed to the Google Groups "ERPNext Developer Forum" group.
To unsubscribe from this group and stop receiving emails from it, send an email to erpnext-developer-forum+un...@googlegroups.com.
To post to this group, send email to er...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.