---
title: "Discussion on \"Git Stash/Cherry-pick/Merge Conflicts: #Day11 of 90DaysofDevOps\" | Hashnode"
description: "Discussion on \"Git Stash/Cherry-pick/Merge Conflicts: #Day11 of 90DaysofDevOps\". Advance Git & GitHub for DevOps Engineers: Part-2"
url: "https://hashnode.com/posts/git-stashcherry-pickmerge-conflicts-day11-of-90daysofdevops/64c495395739c80d502f2a48"
---

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

Discussion

# [Git Stash/Cherry-pick/Merge Conflicts: #Day11 of 90DaysofDevOps](https://namrata.dev/90daysofdevops/git-stashcherry-pickmerge-conflicts-day11-of-90daysofdevops?utm_source=hashnode&utm_medium=feed)

Advance Git & GitHub for DevOps Engineers: Part-2

Jul 29, 2023 · 4 min read · namrata.dev  
Updated Aug 13, 2023  
Read the article

-   [#git-rebase](https://hashnode.com/tag/git-rebase)
-   [#gitmerge](https://hashnode.com/tag/gitmerge)
-   [#gitcherrypick-cherrypickcommit-gitstash-gitstashing-gitconflicts-resolveconflicts-gitmergeconflicts-gitrebase-gitversioncontrol-gitworkflow](https://hashnode.com/tag/gitcherrypick-cherrypickcommit-gitstash-gitstashing-gitconflicts-resolveconflicts-gitmergeconflicts-gitrebase-gitversioncontrol-gitworkflow)
-   [#90daysofdevops](https://hashnode.com/tag/90daysofdevops)

## Written by

[Namrata Kumari](https://hashnode.com/@NamG)

@NamG · Bangluru, India

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

DevOps Engineer

Proficient in a variety of DevOps technologies, including AWS, Linux, Python, Shell Scripting, Docker, Terraform, Kubernetes and Computer Networking.

## Responses

Markdown supported · ⌘↵ to post

No responses yet.