Day 25 git branche merge issue - everything is as per still a bug there help

thor@jumphost ~$ ssh natasha@ststor01
The authenticity of host ‘ststor01 (172.16.238.15)’ can’t be established.
ED25519 key fingerprint is SHA256:2wQeHWGBOna/Tbvmm2+BiJBgl35vqepXYp/qDnNdlcg.
This key is not known by any other names
Are you sure you want to continue connecting (yes/no/[fingerprint])? yes
Warning: Permanently added ‘ststor01’ (ED25519) to the list of known hosts.
natasha@ststor01’s password:
[natasha@ststor01 ~]$ git config --global --add safe.directory /usr/src/kodekloudrepos/blog
[natasha@ststor01 ~]$ git config --global --add safe.directory /opt/blog.git
[natasha@ststor01 ~]$ sudo chown -R natasha:natasha /usr/src/kodekloudrepos/blog

We trust you have received the usual lecture from the local System
Administrator. It usually boils down to these three things:

#1) Respect the privacy of others.
#2) Think before you type.
#3) With great power comes great responsibility.

[sudo] password for natasha:
[natasha@ststor01 ~]$ sudo chown -R natasha:natasha /usr/src/kodekloudrepos/blog
[natasha@ststor01 ~]$ sudo chown -R natasha:natasha /opt/blog.git
[natasha@ststor01 ~]$ cd /usr/src/kodekloudrepos/blog
[natasha@ststor01 blog]$ git checkout master
Already on ‘master’
Your branch is up to date with ‘origin/master’.
[natasha@ststor01 blog]$ git pull origin master
From /opt/blog

  • branch master → FETCH_HEAD
    Already up to date.
    [natasha@ststor01 blog]$ git checkout -b datacenter
    Switched to a new branch ‘datacenter’
    [natasha@ststor01 blog]$ cp /tmp/index.html .
    [natasha@ststor01 blog]$ git add index.html
    [natasha@ststor01 blog]$ git commit -m “Added index.html file”
    Author identity unknown

*** Please tell me who you are.

Run

git config --global user.email “[email protected]
git config --global user.name “Your Name”

to set your account’s default identity.
Omit --global to set the identity only in this repository.

fatal: empty ident name (for [email protected]) not allowed
[natasha@ststor01 blog]$ git config --global user.name “natasha”
[natasha@ststor01 blog]$ git config --global user.email “[email protected]
[natasha@ststor01 blog]$ git commit -m “Added index.html file”
[datacenter 6cadc42] Added index.html file
1 file changed, 1 insertion(+)
create mode 100644 index.html
[natasha@ststor01 blog]$ git push origin datacenter
Enumerating objects: 4, done.
Counting objects: 100% (4/4), done.
Delta compression using up to 16 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 338 bytes | 338.00 KiB/s, done.
Total 3 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
To /opt/blog.git

  • [new branch] datacenter → datacenter
    [natasha@ststor01 blog]$ git checkout master
    Switched to branch ‘master’
    Your branch is up to date with ‘origin/master’.
    [natasha@ststor01 blog]$ git merge --no-ff datacenter -m “Merge datacenter branch”
    Merge made by the ‘ort’ strategy.
    index.html | 1 +
    1 file changed, 1 insertion(+)
    create mode 100644 index.html
    [natasha@ststor01 blog]$ git push origin master
    Enumerating objects: 1, done.
    Counting objects: 100% (1/1), done.
    Writing objects: 100% (1/1), 217 bytes | 217.00 KiB/s, done.
    Total 1 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
    To /opt/blog.git
    dd7c5e5…bf106d8 master → master
    [natasha@ststor01 blog]$ pwd
    /usr/src/kodekloudrepos/blog
    [natasha@ststor01 blog]$ git branch
    datacenter
  • master
    [natasha@ststor01 blog]$ git branch -r
    origin/datacenter
    origin/master
    [natasha@ststor01 blog]$ git log --oneline --decorate --all
    bf106d8 (HEAD → master, origin/master) Merge datacenter branch
    6cadc42 (origin/datacenter, datacenter) Added index.html file
    dd7c5e5 initial commit
    [natasha@ststor01 blog]$ exit
    logout
    Connection to ststor01 closed.
    thor@jumphost ~$ ssh natasha@ststor01

    please support i have done everything right

Hi @omkarjoshi

You can refer to this solution, it should help.

thank you sir it will help me done