Git

What is Git?

Git is a distributed version control system designed to handle everything from small to very large projects with speed and efficiency. It allows multiple people to work on the same project simultaneously, without interfering with each other's work.

Key Concepts:

  1. Repository (Repo):

    • A repository is like a project folder that contains all the files, folders, and version history of your project.
    • It can be local (on your computer) or remote (on a server like GitHub, GitLab, Bitbucket, etc.).

  2. Commit:

    • A commit is a snapshot of your repository at a specific point in time.
    • It includes changes you've made to files and a message describing those changes.
    • Commits are used to track the history of your project and are essential for collaboration.

  3. Branch:

    • A branch is a parallel version of your repository.
    • It allows you to work on new features or fixes without affecting the main codebase (usually the master branch).
    • Branches are lightweight and easy to create, merge, or delete.

  4. Merge:

    • Merging combines changes from different branches into one.
    • It's often used to incorporate new features or bug fixes into the main codebase.

  5. Pull Request (PR):

    • A pull request is a request to merge changes from one branch into another (usually from a feature branch into the master branch).
    • It allows collaborators to review the changes, discuss them, and suggest improvements before merging.

  6. Remote:

    • A remote is a version of your repository hosted on a server.
    • It serves as a central location for collaboration and backup.
    • Popular remote repository hosting services include GitHub, GitLab, and Bitbucket.

Basic Git Workflow:

  1. Initialize a Repository:

    • To start tracking a project with Git, you initialize a repository in the project directory using the git init command.

  2. Add and Commit Changes:

    • After making changes to your files, you add them to the staging area using git add.
    • Once you're satisfied with the changes, you commit them to the repository using git commit -m "Commit message".

  3. Create and Manage Branches:

    • You create a new branch using git checkout -b branch_name.
    • Switch between branches using git checkout branch_name.
    • List branches with git branch.
    • Delete branches with git branch -d branch_name.

  4. Merge Changes:

    • Merge changes from one branch into another using git merge branch_name.

  5. Collaborate with Remotes:

    • Add a remote repository with git remote add remote_name remote_url.
    • Push changes to a remote repository with git push remote_name branch_name.
    • Pull changes from a remote repository with git pull remote_name branch_name.
    • Clone a remote repository to your local machine with git clone remote_url.

  6. Review and Merge Pull Requests:

    • Create a pull request on a remote repository's website.
    • Review pull requests, leave comments, and discuss changes with collaborators.
    • Merge approved pull requests into the main branch.

Learning Resources:

  1. Official Git Documentation: Git SCM

Comments

Post a Comment

Popular posts from this blog

AEM Developer Series Syllabus

AEM 6.5/Cloud Development Syllabus Theory Part What is AEM? Versions and its Difference     AEM Environment Setup (Author vs Publisher vs Dispatcher) UI Consoles in AEM. DAM (Digital Asset Management)    Components Pages and Page Properties Templates Users and Groups Tags Experience Fragments Content Fragments Data Storage in AEM Development Part Front End Software’s required and installations.  Maven Git Commands Creating an AEM Project using Maven Different Modules in AEM and Filter.xml Deploying code to AEM instance (Zip vs Java Bundle) Templates     Static Templates     Editable templates Components WCM Core Components Overlaying/Proxy Component Overriding/Extending Component Custom Component Creation Data Fields on Component Cq:editconfig Rich Text Component Sling Resource Merger Style System Sling:resourceSuperType vs Sling:resourceType Adding Page Properties to Template Filter.xml Sightly Introduction to Sight...
Read more

AEM Developer interview Questions

AEM Stack Technology or AEM architecture? AEM 6.3 vs 6.4 vs 6.5 vs Cloud  6.5 vs Cloud? How do you identify the components , by using UX design? How do you Proxy /Overlay a Component? How do you Override /extend a Component? How do you create a component from scrath in touch ui? sling:resourceSuperType vs Sling:resourceType? Name few Sling:resourceType in dialogue? What are cq:editconfig? What are cq:listeners? What are cq:dropTargets? What are cq:inPlaceediting? What is richtext? What are Style Systems and how do you implement them? Refer:  Style System | Adobe Experience Manager What are few core components you used in your project? Which have more preference apps or libs? What is sling resource merger? Refer:  Using the Sling Resource Merger in AEM | Adobe Experience Manager What are the properties in Sling resource Merger? Where are Pages stored and in which format? How does Sling resolution happens for /test/a/b.selector.json and /b.selector.json Refer...
Read more

Creating an AEM Project using Maven

Image
AEM 6.5.5 Project can be created by using maven Command. Make sure the softwares are installed . Here we will use the below command on the command prompt. Run the below command on cmd prompt. mvn -B archetype:generate -D archetypeGroupId=com.adobe.aem -D archetypeArtifactId=aem-project-archetype -D archetypeVersion=42 -D appTitle="Learn AEM" -D appId="learnaem" -D groupId="com.learnaem" -DincludeExamples=y -DaemVersion=6.5.5 -DincludeDispatcherConfig=n -DfrontendModule=none -DincludeExamples=Y -DincludeErrorHandler=Y -DlanguageCountry="en_us" -DsingleCountry=y Note: If you want to run for FE framework like react/angular then change command to  frontendModule=react or angular We are using Adobe Archtype 26 which will create the structure of the project. For more info refer the adobe archtype github . All the above mentioned variable can be refered in the adobe archtype read.md github. with above command below folder structure is created. All Folde...
Read more