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

Module 2:CaseStudy-2-Resolving Merge Conflicts #201

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Module 2:CaseStudy-2-Resolving Merge Conflicts #201

wants to merge 6 commits into from

Commits on Aug 5, 2024

  1. committing from feature2

    @iamanoopdogra
    iamanoopdogra committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    e104297 View commit details
    Browse the repository at this point in the history

  2. master commit

    @iamanoopdogra
    iamanoopdogra committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    1641d14 View commit details
    Browse the repository at this point in the history

  3. commit from feature2

    @iamanoopdogra
    iamanoopdogra committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    d457133 View commit details
    Browse the repository at this point in the history

  4. feature1 commit

    @iamanoopdogra
    iamanoopdogra committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    0a76574 View commit details
    Browse the repository at this point in the history

  5. first commit

    @iamanoopdogra
    iamanoopdogra committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    960141a View commit details
    Browse the repository at this point in the history

  6. second commit

    @iamanoopdogra
    iamanoopdogra committed Aug 5, 2024
    Configuration menu
    Copy the full SHA
    bfc5d3c View commit details
    Browse the repository at this point in the history