25 Day 25: Git Merge Branches

#1

While working on the Git branching lab, I followed the exact instructions:

  • Created the xfusion branch from master inside /usr/src/kodekloudrepos/media
  • Copied /tmp/index.html, committed it in xfusion
  • Merged back into master
  • Pushed both branches to /opt/media.git

Both branches exist on origin and the commit is visible. However, the validation fails with the error:

- new git branch 'xfusion' is not created under '/usr/src/kodekloudrepos/media/' repo on Storage server

I suspect the checker is only looking for the branch in the local repo path (/usr/src/kodekloudrepos/media/.git/refs/heads/) instead of validating against the remote repository.
Could you please confirm if this is a validation bug?

123
123516×581 29.5 KB

#2

Hi @SHAHAAIB

Refer to this solution; you need to understand the requirements in the question.
It requires you to commit and push the changes to both the branch you create and the master branch as well.

#4

I am working on the lab: “Create a new branch in /usr/src/kodekloudrepos/ecommerce repo and merge into master”.

I have completed all required steps correctly:

  1. Created the branch nautilus from master.
  2. Copied /tmp/index.html into the repo.
  3. Added and committed the file in the nautilus branch.
  4. Pushed the nautilus branch to the origin.
  5. Merged nautilus into master and pushed master to origin.

I have verified the branch exists locally and on the remote:

git branch
git ls-remote --heads origin
git log --oneline --graph --decorate -n 5

Despite this, the lab checker still reports:

“- new git branch ‘nautilus’ is not created under ‘/usr/src/kodekloudrepos/ecommerce/’ repo on Storage server”

It seems like an environment issue, not a mistake on my side. Could you please verify and help resolve this?

#5

I’ve verified, and the lab works fine.
This solution should help you.