← العودة
Blog Post
عنوان المحادثة: PS C:\Users\miraz\amazon_project> git statusOn branch mainYour branch ...
التاريخ: 21.11.2025
التصنيف: 💻 البرمجة وتطوير البرمجيات
إجمالي الرسائل: 2 | ياسر: 1 | M: 1
المحادثة الكاملة - 21.11.2025
ياسر
أنا عامل فقط api
21.11.2025 00:53
M
PS C:\Users\miraz\amazon_project> git statusOn branch mainYour branch and 'origin/main' have diverged,and have 1 and 1 different commits each, respectively. (use "git pull" if you want to integrate the remote branch with yours)You have unmerged paths. (fix conflicts and run "git commit") (use "git merge --abort" to abort the merge)Changes to be committed: deleted: pycache/amazon_api_final.cpython-313.pyc deleted: pycache/amazon_scrapy_case.cpython-313.pyc deleted: pycache/images_manipulation.cpython-313.pyc deleted: pycache/my_ai.cpython-313.pyc deleted: pycache/telegram_bot_amazon.cpython-313.pyc modified: amazon_api_final.py modified: my_ai.py modified: telegram_bot_amazon.py modified: test.pyUnmerged paths: (use "git add ..." to mark resolution) both added: coupons_cache.json both modified: main_pics/img.jpg both modified: products_database.jsonPS C:\Users\miraz\amazon_project> git diff --name-only --diff-filter=U
21.11.2025 01:44
← العودة إلى الرئيسية