Day 30

Today we will learn to merged popped stash.

Problem Statement:

When you want to reapply your changes but you already continued working on your file, you might get a merge conflict! Let's practise this situation.

Pop the changes from the stash with git stash pop and resolve the merge conflict. Commit the resolved changes and clear the stash stack afterwards.

Files:

• recipe

Questions:

• Did you resolve the confict and commit?
• Did you clear stash stack?

Description of the problem.

Solution:

1. Check out the stash list.

git stash list

2. Pop the stash item.

git stash pop

3. Edit the files necessary to commit.

# Edit files
nvim recipe

# Add the file and commit it
git add .
git commit -m "updated"

4. Clear out the stash list.

git stash clear

Description of the solution.