Skip to content
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

Jump to bottom

Bug/#4497 Unable to Cherry Pick Merge Commit Solved #4944

Merged
merged 22 commits into from
Dec 4, 2023
Merged

Bug/#4497 Unable to Cherry Pick Merge Commit Solved #4944

merged 22 commits into from
Dec 4, 2023
+234 −53

Commits on Oct 11, 2023

  1. Parser and Logic For Parent Commit Added

    @RounakJoshi09
    RounakJoshi09 committed Oct 11, 2023
    Configuration menu
    Copy the full SHA
    13d85b6 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Unit Test Cases Added

    @RounakJoshi09
    RounakJoshi09 committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    3118c7c View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2023

  1. All Unit Tests Passing

    @RounakJoshi09
    RounakJoshi09 committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    6e5cd2b View commit details
    Browse the repository at this point in the history

  2. documentation added, Tests Fixed

    @RounakJoshi09
    RounakJoshi09 committed Oct 14, 2023
    Configuration menu
    Copy the full SHA
    4051b42 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit

    @RounakJoshi09
    RounakJoshi09 authored Oct 14, 2023
    Configuration menu
    Copy the full SHA
    0a0bd0a View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Suggested Changes FOR PR DONE

    @RounakJoshi09
    RounakJoshi09 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    d8500f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bug/#4497_unable-to-cherrypick-merge-commit' of https:/… 

    …/github.com/RounakJoshi09/mermaid into bug/#4497_unable-to-cherrypick-merge-commit
    @RounakJoshi09
    RounakJoshi09 committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    6eee897 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit

    @RounakJoshi09
    RounakJoshi09 authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    d65191f View commit details
    Browse the repository at this point in the history

  2. Merge Conflict Resolved

    @RounakJoshi09
    RounakJoshi09 authored Oct 19, 2023
    Configuration menu
    Copy the full SHA
    827808d View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2023

  1. Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit

    @RounakJoshi09
    RounakJoshi09 authored Oct 22, 2023
    Configuration menu
    Copy the full SHA
    f92ad63 View commit details
    Browse the repository at this point in the history

  2. e2e test case added

    @RounakJoshi09
    RounakJoshi09 committed Oct 22, 2023
    Configuration menu
    Copy the full SHA
    58e9e56 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Documentation Modified New Ex Added

    @RounakJoshi09
    RounakJoshi09 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    b0cfdcc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit

    @RounakJoshi09
    RounakJoshi09 authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    122e592 View commit details
    Browse the repository at this point in the history

  3. Linting Issue Fixed

    @RounakJoshi09
    RounakJoshi09 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    ca96c0f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bug/#4497_unable-to-cherrypick-merge-commit' of https:/… 

    …/github.com/RounakJoshi09/mermaid into bug/#4497_unable-to-cherrypick-merge-commit
    @RounakJoshi09
    RounakJoshi09 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    b461efa View commit details
    Browse the repository at this point in the history

  5. Updated gitgraph.md

    @RounakJoshi09
    RounakJoshi09 authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    7f1e0ab View commit details
    Browse the repository at this point in the history

  6. Linting Issue Fixed

    @RounakJoshi09
    RounakJoshi09 committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    5834818 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2023

  1. Error Hash Removed

    @RounakJoshi09
    RounakJoshi09 committed Nov 17, 2023
    Configuration menu
    Copy the full SHA
    aadf533 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit

    @RounakJoshi09
    RounakJoshi09 authored Nov 17, 2023
    Configuration menu
    Copy the full SHA
    c19fa12 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2023

  1. Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit

    @RounakJoshi09
    RounakJoshi09 authored Dec 3, 2023
    Configuration menu
    Copy the full SHA
    c6bf908 View commit details
    Browse the repository at this point in the history

  2. Condition of Parent Id Without Merge Commit Added

    @RounakJoshi09
    RounakJoshi09 authored Dec 3, 2023
    Configuration menu
    Copy the full SHA
    31a1de1 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. fix: Check if parentCommit is provided

    @sidharthv96
    sidharthv96 committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    d22ee8d View commit details
    Browse the repository at this point in the history