Skip to content

Задание 2: конфликты Second branch в main #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Задание 2: конфликты Second branch в main #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4c7fce
feat: create conflicts
Nov 19, 2024
edcbec4
fix: main
Nov 21, 2024
1ece50e
feat: changes
Feb 27, 2025
ed17b6c
тренировка/решение конфликта
digitalcowboyy Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions git/src/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def load_books(filename='library.json'):
except json.JSONDecodeError:
return []


def save_books(books, filename='library.json'):
"""
Сохранение списка книг в JSON-файл.
Expand Down Expand Up @@ -102,6 +103,7 @@ def main():
title_to_remove = input("Введите название книги, которую хотите удалить: ").strip()

new_books = remove_book(books, title_to_remove)

if len(new_books) < len(books):
books = new_books
save_books(books)
Expand All @@ -119,6 +121,7 @@ def main():
else:
print("Ничего не найдено.")


elif choice == '5':
print("Выход из программы.")
break
Expand Down