#5644 (merger conflict?)

by Johana Amorin · in Developers · assigned to Johana Amorin

Summary

I did git pull to update the changes and I lost several files in the most projects, such as manage.py, setting.py and others, this in all my projects. I don't have the same that there are in the repositories. Theoretically the git pull was successfull. I ran git status and I had Untracked files: (use "git add <file>..." to include in what will be committed) ../docs/ ../lino_book.egg-info/ ./ (I don't kow why) and I did commits. But I don'n know why I'm missing files in all my projects

Children

Comments

2 years, 4 months ago by Luc Saffre about #5644 (merger conflict?) : I don't think that you forgot to create a git repository in your projects. I think that my instructions for setting the remotes in your repositiries weren't fool-proof. I think so because we saw together that the remotes of your book project were pointing to the lino.git on gitlab.
2 years, 4 months ago by Johana Amorin about #5644 (merger conflict?) : I forgot create a git repository in my projects sorry!!!!! It´s ok now!!!
2 years, 4 months ago by Luc Saffre about #5644 (merger conflict?) : I updated the instructions in [url dev.lino-framework.org/team/pull_request.html How to submit a pull request] because they were probably the reason for Joy's problem with the merge.
2 years, 4 months ago by Luc Saffre about #5644 (merger conflict?) : Did you create a git repository in your own projects? But even then... I just can't imagine how "git pull" would remove your local work.
2 years, 4 months ago by Johana Amorin about #5644 (merger conflict?) : see description
2 years, 4 months ago by Johana Amorin about #5644 (merger conflict?) : Created new Ticket #5644 (merger conflict?).