Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Yandex-Practicum/Java-Module-Project
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: sred75/Java-Module-Project-ES
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 5 files changed
  • 1 contributor

Commits on Oct 31, 2022

  1. коммит 010

    @sred75
    sred75 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    b68aa71 View commit details
    Browse the repository at this point in the history

  2. коммит 010

    @sred75
    sred75 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    82a8dd3 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' 

    # Conflicts:
#	src/main/java/goodsAddingEngine.java
    @sred75
    sred75 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    a54fd55 View commit details
    Browse the repository at this point in the history

  4. коммит 020 - набивка массива товаров работает, но в сканере не обраба… 

    …тывается некорректный ввод, прога вылетает
    @sred75
    sred75 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    ec91d41 View commit details
    Browse the repository at this point in the history

  5. коммит 030 - убрал проверку скаенера >0 внутрь проверки ввода на doub… 

    …le, переписал логику в новом классе goodsEntering, вылетов нет
    @sred75
    sred75 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    e5858d6 View commit details
    Browse the repository at this point in the history

  6. коммит 040 - отладил ввод списка товаров и цен через goodsEntering, в… 

    …ылетов нет
    @sred75
    sred75 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    d50cf48 View commit details
    Browse the repository at this point in the history

  7. коммит 050 - отладил и удалил всё лишнее

    @sred75
    sred75 committed Oct 31, 2022
    Configuration menu
    Copy the full SHA
    b5d629f View commit details
    Browse the repository at this point in the history
Loading