Git Questions & Answers

 

1️⃣ What is Git?

Git is a distributed version control system that tracks changes in source code and enables collaborative development.

Unlike centralized systems, Git stores full repository history locally.

2️⃣ What is the difference between Git and GitHub?

  • Git → Version control tool

  • GitHub → Cloud platform to host Git repositories

Other alternatives:

  • GitLab

  • Bitbucket

3️⃣ Explain Git Architecture

Git has three main areas:

  1. Working Directory

  2. Staging Area

  3. Repository (.git folder)

Flow:

Working Directory → Staging Area → Local Repository → Remote Repository

4️⃣ What is the difference between merge and rebase?

🔹 Merge

  • Combines branches

  • Keeps history intact

  • Creates merge commit

git merge feature-branch

🔹 Rebase

  • Rewrites commit history

  • Creates linear history

  • Cleaner commit log

git rebase main

Best Practice:Use rebase for local cleanup, merge for shared branches.

5️⃣ What is Git Stash?

Temporarily saves uncommitted changes.

git stash
git stash pop

Useful when switching branches quickly.

6️⃣ What is Cherry-Pick?

Apply a specific commit from another branch.

git cherry-pick <commit_id>

Used in hotfix scenarios.

7️⃣ How to Resolve Merge Conflicts?

Steps:

  1. Identify conflicting files

  2. Edit manually

  3. Remove conflict markers

  4. Add and commit

8️⃣ What is HEAD in Git?

HEAD is a pointer to the current active branch.


9️⃣ What is the difference between reset and revert?

Command                        What it Does
reset                    Moves HEAD and rewrites history
revert                    Creates new commit to undo changes

Use revert in shared branches.

🔟 What is Git Reflog?

Tracks all movements of HEAD.Useful for recovering deleted commits.

git reflog


Comments

Post a Comment

Popular posts from this blog

Database Integration in FastAPI (SQLAlchemy CRUD)

  Introduction So far, we’ve built APIs without storing data.But real-world applications need a database to: Store user data. Manage products. Persist application state. In this blog, we’ll connect FastAPI with a database using SQLAlchemy and perform CRUD operations . What is SQLAlchemy? SQLAlchemy is a powerful Python ORM (Object Relational Mapper) that allows you to: Interact with databases using Python code. Avoid writing raw SQL queries. Work with models instead of tables. Step 1: Install Dependencies pip install sqlalchemy (For SQLite, no extra driver needed) Project Structure Update app/ ├── main.py ├── database/ │ ├── connection.py ├── models/ │ ├── item.py ├── schemas/ │ ├── item.py ├── routes/ │ ├── item.py Step 2: Database Connection app/database/connection.py from sqlalchemy import create_engine from sqlalchemy . orm import sessionmaker , declarative_base DATABASE_URL = "sqlite:///./test.db" engine = create_engine ( DAT...
Read more

Middleware & CORS in FastAPI

  Introduction As your API grows, you may need to: Log requests Modify responses Handle cross-origin requests This is where Middleware and CORS (Cross-Origin Resource Sharing) come into play.They help control how requests and responses flow through your application. What is Middleware? Middleware is a function that runs: Before a request reaches your route After a response is returned Think of it as a pipeline layer between client and server. Request Flow with Middleware Client → Middleware → Route → Middleware → Response Creating Custom Middleware from fastapi import FastAPI , Request import time app = FastAPI () @ app . middleware ( "http" ) async def log_requests ( request : Request , call_next ): start_time = time . time() response = await call_next ( request ) process_time = time . time() - start_time print ( f"Request: { request . url} | Time: { process_time } " ) return response What This Middle...
Read more

Python Data Handling

Python Data Handling for Beginners In Python, data handling means storing, changing, and using data in different ways. In this post, you will learn: Lists Tuples Dictionaries Sets String Methods Type Conversion 1. Python Lists :Lists store many values in one variable.                fruits = ["apple", "banana", "mango"]                                                                       Method                          Use                                            append()          ...
Read more