---
title: "Discussion on \"Git Advanced - Rebase, Cherry-pick, Conflict Resolution\" | Hashnode"
description: "Discussion on \"Git Advanced - Rebase, Cherry-pick, Conflict Resolution\". Learning points:\n\nGit Rebase – Deep Dive\n\nGit Cherry-pick – Applying specific commits from one branch to another.\n\nResolving Merge Conflicts – Identifying and resolving conflicts efficiently.\n\nRewriting History – advanced use cases\n\nAmending Commits ..."
url: "https://hashnode.com/posts/git-advanced-rebase-cherry-pick-conflict-resolution/67c9a565faeaf1638012af21"
---

[Feed](https://hashnode.com/feed) /

Discussion

# [Git Advanced - Rebase, Cherry-pick, Conflict Resolution](https://gourob.hashnode.dev/git-advanced-rebase-cherry-pick-conflict-resolution?utm_source=hashnode&utm_medium=feed)

Learning points: Git Rebase – Deep Dive Git Cherry-pick – Applying specific commits from one branch to another. Resolving Merge Conflicts – Identifying and resolving conflicts efficiently. Rewriting History – advanced use cases Amending Commits ...

Mar 6, 2025 · 16 min read · gourob.hashnode.dev  
Read the article

-   [#github](https://hashnode.com/tag/github)
-   [#git](https://hashnode.com/tag/git)
-   [#gitlab](https://hashnode.com/tag/gitlab)
-   [#version-control](https://hashnode.com/tag/version-control)
-   [#version-control-systems](https://hashnode.com/tag/version-control-systems)
-   [#git-github-version-control-linux-git-commands-github-repositories-cheat-sheet-git-branching-git-workflow-collaboration-git-history-git-commit-git-merge-git-rebase-git-pull-request-git-fork-git-stash-git-remote-git-ignore-git-hooks-github-issues-github-actions-github-pages-github-security-git-for-beginners-advanced-git-techniques-github-collaboration-git-integration-git-flow-git-best-practices](https://hashnode.com/tag/git-github-version-control-linux-git-commands-github-repositories-cheat-sheet-git-branching-git-workflow-collaboration-git-history-git-commit-git-merge-git-rebase-git-pull-request-git-fork-git-stash-git-remote-git-ignore-git-hooks-github-issues-github-actions-github-pages-github-security-git-for-beginners-advanced-git-techniques-github-collaboration-git-integration-git-flow-git-best-practices)
-   [#version-control-for-beginners](https://hashnode.com/tag/version-control-for-beginners)
-   [#collaboration](https://hashnode.com/tag/collaboration)
-   [#collaboration-strategies](https://hashnode.com/tag/collaboration-strategies)
-   [#collaboration-tools](https://hashnode.com/tag/collaboration-tools)
-   [#devops](https://hashnode.com/tag/devops)
-   [#devops-articles](https://hashnode.com/tag/devops-articles)
-   [#devops-journey](https://hashnode.com/tag/devops-journey)
-   [#learning-in-public](https://hashnode.com/tag/learning-in-public)
-   [#versioncontrol](https://hashnode.com/tag/versioncontrol)

## Written by

[GOUROB DAS](https://hashnode.com/@Gourobdas0103)

@Gourobdas0103 · West Bengal, INDIA

  
[View profile](https://hashnode.com/@Gourobdas0103)

fresher DevOps and Cloud Ops trainee

About seeking a fresher job opportunity in DevOps and CloudOps | AWS | GitHub | LInux | GitHub Actions | Docker | Volunteering @ AWS User Group Kolkata | MCA Graduated 2024

## Responses

Markdown supported · ⌘↵ to post

No responses yet.