Elevatic Software’s Post

Git isn't just a version control tool — it's the starting point of your entire delivery pipeline. Every CI/CD pipeline, every deployment, every infrastructure change begins with a Git event. A push, a merge, a pull request. Here are the Git commands that actually matter in DevOps: The daily basics: → git clone — copy a repo to your local machine → git pull — get the latest changes from remote → git add . — stage all changes → git commit -m " " — save your changes with a message → git push — send your changes to remote Branching: → git branch — list all local branches → git checkout -b name — create and switch to a new branch → git merge branch-name — merge changes from one branch into another Debugging and recovery: → git log --oneline — see commit history in a clean format → git diff — see exactly what changed between states. → git revert <commit> — undo a commit safely without rewriting history → git stash — temporarily save changes you're not ready to commit Status: → git status — Run git status constantly. It tells you exactly where you are, what's staged, what's not, and what branch you're on. It saves so much confusion. Understanding Git properly means understanding how the entire delivery process begins. What Git command do you wish you had learned earlier? 👇 #DevOps #Git #VersionControl #CICD #LearningDevOps #BeginnerDevOps #TechCareers #LearningInPublic

Git Series | Day 8: Mastering Git Rebase — The Professional Standard for Clean History 🛠️✨ Integration is easy; maintaining a clean, readable history is hard. Today I moved beyond the standard 3-way merge to master Git Rebase, the tool that allows DevOps teams to keep their project timelines linear and manageable. 1. The Problem: The "Mixed" History of 3-Way Merges While a 3-way merge works, it has two major drawbacks in large-scale projects: Extra Commits: Every merge creates a "Merge Commit" which doesn't contain actual code changes, just integration data. Non-Linearity: The commit history becomes a "tangled web" of branches crossing over each other, making it difficult to audit or debug specific features. 2. The Solution: What is Rebase? Rebase is the process of moving or combining a sequence of commits to a new base commit. Instead of "merging" the branches, I am effectively rewriting the history so it looks like the feature branch was started from the most recent commit on the master branch. The Result: A perfectly linear history with no extra merge commits. The Command: While on the feature branch, run < git rebase master > 3. The Rebase Conflict Workflow Conflicts in rebase happen commit-by-commit, giving you granular control. My standardized resolution process is now: Identify: Find the file causing the conflict. Resolve: Edit the file, remove the headers/conflict markers. Stage: git add <file>. Safety Valve: If things go wrong, git rebase --abort brings me back to the pre-rebase state. #Git #DevOps #GitRebase #CleanCode #VersionControl #SoftwareArchitecture #100DaysOfCode #GitWorkflow #EngineeringExcellence

🚀 Day 39 – Git Merge Conflicts & Resolution ⚠️🔧 Today I learned about merge conflicts in Git and how to resolve them — an important skill when working in team projects 💻 ⚠️ What is a Merge Conflict? A merge conflict occurs when two changes are made to the same file or line of code in different branches, and Git is unable to automatically merge them. 🔍 When Do Conflicts Happen? Two developers edit the same file Same line is modified in different branches Changes overlap ⚙️ How to Identify Conflict When merging, Git shows: <<<<<<< HEAD Your changes ======= Other branch changes >>>>>>> feature 🛠️ Steps to Resolve Conflict 1️⃣ Open the conflicted file 2️⃣ Identify the conflicting code 3️⃣ Edit and keep the correct version 4️⃣ Remove conflict markers 5️⃣ Add and commit 👉 Commands: git add . git commit -m "resolved conflict" 💡 Best Practices ✔ Pull latest code before starting work ✔ Use small commits ✔ Communicate with team ✔ Avoid editing same file simultaneously 📌 My Learning Today Understanding merge conflicts helped me realize how important collaboration and proper version control are in real-world projects. Resolving conflicts is a key DevOps skill 💪 #Git #MergeConflict #DevOps #VersionControl #CloudComputing #LearningJourney #TechSkills #WomenInTech #CloudEngineer

🚀 Day 6 of #100DaysOfDevOps Challenge Today I explored one of the most fundamental pillars of modern software development — Version Control Systems (VCS) and Git 🔥 📌 Here’s what I learned today: 🔹 What is Version Control System (VCS)? A system that tracks changes in code over time, enabling collaboration, history tracking, and easy rollback when needed. 🔹 Why is it important? ✔️ Maintains complete history of changes ✔️ Enables team collaboration ✔️ Supports branching & experimentation ✔️ Ensures code safety and integrity 🔹 What is Git & Why Git? Git is a distributed VCS known for its speed, flexibility, and powerful branching capabilities. It’s widely used in DevOps and CI/CD pipelines. 🔹 Git Stages Explained: 📂 Working Directory – Where you create/modify files 📌 Staging Area – Where changes are prepared (git add) 📦 Repository – Where changes are permanently stored (git commit) 🔹 Git Lifecycle: Modify ➝ Stage ➝ Commit ➝ Push ➝ Pull 🔹 Linux Commands to Install Git: sudo apt install git -y sudo yum install git -y sudo dnf install git -y 🔹 Git Logs: Tracking history using commands like: git log git log --oneline git log --graph 💡 Key Takeaway: Mastering Git is not optional — it’s a must-have skill for every DevOps Engineer to manage code efficiently and collaborate seamlessly. 📈 Every commit you make is a step closer to becoming a better engineer! 🔥 What’s next? Diving deeper into branching strategies and Git workflows! #DevOps #100DaysOfDevOps #Git #VersionControl #Linux #CloudComputing #SoftwareDevelopment #DevOpsJourney #LearningInPublic #TechGrowth #CI_CD #Automation #Programming #Developers #flm #Engineering #CareerGrowth #OpenSource #TechCommunity #BuildInPublic 🚀

Git in Real Life: When I started using Git, I thought it’s just for pushing code. But in real production environments, Git becomes the single source of truth. Let me share a real-world scenario Scenario: Production Issue One day, a critical service started failing after deployment. Everything looked fine in CI/CD, but users were facing errors. First step? Not logs… Git history. Using: git log --oneline We traced a recent commit where a config file was modified. Use Case: Root Cause Analysis We compared changes using: git diff <commit-id> Found that: - Environment variable was changed - API endpoint misconfigured A small change, but huge impact. Fix Strategy Instead of manually fixing, we rolled back safely: git revert <commit-id> git push origin main Production stabilized within minutes Daily Use Cases of Git in DevOps - Managing infrastructure code (Terraform, Kubernetes YAMLs) - Version controlling CI/CD pipelines - Tracking configuration changes - Enabling team collaboration - Supporting GitOps workflows Must-Know Commands (Real Usage) git clone <repo> git checkout -b feature-branch git add . git commit -m "feature update" git push origin feature-branch git pull origin main git merge main Troubleshooting Scenarios 1. Merge Conflict git pull origin main Fix conflicts manually → then: git add . git commit -m "resolved conflict" 2. Wrong Commit Made git reset --soft HEAD~1 3. Lost Changes git stash git stash apply 4. Check Who Changed What git blame <file> Key Learning Git is not just a tool. It’s your safety net, audit system, and collaboration engine. In production, debugging often starts from Git, not from code. Final Thought A single commit can: - Break production - Or save hours of debugging So always: Commit smart. Review carefully. Deploy confidently. #Git #DevOps #Troubleshooting #VersionControl #Cloud #Git Lab #MLOPS #devsecops

Git Branching Strategies — What actually matters in real projects When I first started using Git, I thought it was simple: create a branch, push code, and the job is done. But working on real projects changed that perspective. The wrong branching strategy does not just create small issues. It leads to confusion, messy workflows, and problems that become harder to fix over time. Here is a simple understanding of the most commonly used strategies: Feature Branching : Each feature is developed in its own branch and merged back once complete. This keeps work isolated and makes code reviews easier. It is one of the most practical approaches for most teams. Gitflow : A more structured model with dedicated branches such as main, develop, feature, release, and hotfix. It works well for teams that follow strict release cycles and need better version control. GitHub Flow A simpler approach where the main branch is always production-ready. Changes are made in short-lived branches and merged quickly. Ideal for teams practicing continuous deployment. GitLab Flow : Combines feature branching with environment-based workflows like staging and production. It integrates well with CI/CD pipelines and supports continuous delivery. Trunk-Based Development : Developers merge small changes frequently into the main branch. This requires strong discipline and testing practices but enables faster feedback and delivery. One important thing I learned is that there is no single “best” strategy. The right choice depends on your team size, project complexity, release frequency, and deployment process. A common mistake I have seen is teams adopting complex strategies like Gitflow without actually needing that level of structure. For me, feature branching felt like the most natural starting point. It is simple, clear, and effective. What has worked best for your team? #DevOps #Git #GitHub #CICD #VersionControl #SoftwareEngineering #Automation

Today I completed a Git/Gitea task that looked simple on paper: Review a pull request, approve it, and merge the story/fox-and-grapes branch into master. Sounds straightforward. But between me and that green tick were the small details that matter in real team workflows. Let me break it down 👇 What the Task Required: Log in as tom. Open the pull request titled Added fox-and-grapes story. Review the changes carefully. Approve the PR. Merge it into master. 🔴 What I Did (and what it means in real life): Checked the repository and confirmed the branch. This was the part where I made sure I was in the right repo and on the right feature branch. In a real team, this prevents you from reviewing the wrong code or merging the wrong work. Opened the pull request and reviewed the story changes. I went through the file diff to verify the content was complete and consistent. In production, this is how teams catch mistakes before they reach the main branch. Approved the pull request. Approval is more than a click, it signals that the change is acceptable and ready to move forward. In a real team, this is how code quality stays intentional, not accidental. Merged the PR into master. This was the final step that actually delivered the work into the main branch. In a live environment, this is the point where a feature becomes part of the product and is ready for everyone else to build on. A pull request is not just a button. It is a workflow that protects the codebase, keeps collaboration clean, and makes sure changes are reviewed before they land. In the lab, I had time to inspect, approve, and merge. In a real team, the same process helps avoid broken releases, miscommunication, and silent errors. This is why we practice. This is why we review carefully. This is why version control is more than Git commands, it is teamwork in action. 💪 Do you get?? #Git #Gitea #PullRequest #CodeReview #DevOps #CloudEngineering #LearningInPublic #WomenInTech

A clean branching model that helps us ship confidently while keeping production safe and maintainable. 🔀 Git Branching Strategy – Simple & Production‑Ready Sharing the Git branching strategy we follow to keep our codebase stable, scalable, and release‑friendly😊   Main Branch (main / master) Holds stable, production‑ready code Always kept up to date Acts as the single source of truth for production Feature Branch Created from main to develop new features or breaking changes Enables developers to work independently without affecting production Example: feature/login-auth -> Once completed and tested: Feature branch is merged back into main Branch is deleted to keep the repository clean Release Branch Created from main when preparing for a production release Used only for: -> Final testing -> Bug fixes -> Polishing No new features added here Example: release/v1.0   Ship / Deploy Code is deployed to production from the release branch Release is version‑tagged for traceability Example: v1.0.0   Hotfix Branch Created directly from main to handle urgent production issues Example: hotfix/critical-bug -> After fixing: Merged back into main Also merged into the active release branch to keep everything in sync Flow Summary main → feature → merge to main → release → test → ship Urgent fix: main → hotfix → fix → merge back to main and release This strategy helps us maintain: -> Production stability -> Faster collaboration -> Safer releases -> Quick recovery from critical issues #Git #DevOps #BranchingStrategy #CICD #BestPractices

Day 10 of DevOps — Git Branching Strategy👨💻📈 A branch is a parallel version of your codebase. Let's a developer work on a new feature, a bug fix, or a major change in complete isolation without touching the code that is currently running in production. The main codebase stays stable. The new work happens separately. When it is ready and tested, it gets merged in. The four types of branches — and what each one is for $ Main / Master Branch: The primary branch. Always stable. Always production-ready. This is the source of truth for the current state of the product. Nobody commits experimental work directly here. $ Feature Branches: Short-lived branches created for a specific piece of work. When development is complete and tests pass, it gets merged back into main. Then it is deleted. Feature branches are not meant to live long. $ Release Branches: This one was new to me. > When a version is ready to ship, a release branch is cut from main. Final stabilisation and testing happen here and not on main. > The release goes to customers from this branch. Main continues moving forward with new development while the release branch is locked down for that version. > Let's say Shipping version 1.2 to customers while simultaneously building version 1.3 on main without the two interfering with each other.😮 $ Hotfix Branches: Also new to me.😦 > A critical bug is found in production. You cannot wait for the normal development cycle. > A hotfix branch is created directly from the release branch, the fix is applied, tested, and merged back into both the release branch and main. Production gets the fix fast. Main stays up to date. Coming from backend: I've used feature branches on every project. Main branch protection, PR-based merges, which is a standard practice. But I'd never used release branches or hotfix branches. Working solo on portfolio projects, I never needed them. One thing is for sure: You cannot ship new features and patch production bugs on the same branch. That's what release and hotfix branches solve.👍🏾 #DevOps #Git #BranchingStrategy #GitHub

🚀 Day 9/100 – Git Fundamentals (Clone, Commit, Push) If you're in DevOps or development, Git is not optional… it’s your daily driver 🚗 Let’s break down the 3 most important commands 👇 🔍 What is Git? Git is a version control system that helps you track changes in your code and collaborate with others. ⚙️ 1. git clone – Get the code git clone https://lnkd.in/gG8mt6kE 👉 Copies a remote repository to your local machine ✍️ 2. git commit – Save your changes git add . git commit -m "Added new feature" 👉 Captures a snapshot of your changes 💡 Think of it as a save point in your project 🚀 3. git push – Upload your changes git push origin main 👉 Sends your commits to the remote repository 🔄 Complete Flow git clone → make changes → git add → git commit → git push 👉 That’s your daily DevOps workflow 🔁 💡 Why Git Matters ✅ Track changes ✅ Collaborate with teams ✅ Rollback if something breaks ✅ Integrates with CI/CD pipelines ⚠️ Common Mistakes ❌ Forgetting git add before commit ❌ Pushing directly to main branch ❌ Writing unclear commit messages ❌ Merge conflicts panic 😅 📌 Key Takeaway 👉 Clone → Work → Commit → Push Master this flow and you’ve mastered Git basics. 💬 What’s your most used Git command daily? #Git #DevOps #VersionControl #CI_CD #100DaysOfDevOps #LearningInPublic