It's B

Tag: git

  • How to fix – Fingerprint has already been taken

    How to fix – Fingerprint has already been taken

    Sometimes we have “Fingerprint has already been taken” while adding our ssh key.

    To fix that issue, we need to generate a new ssh key. But the problem is your existing ssh key is added to other resources so if you generate a new one, you have to replace it everywhere.

    Instead of doing this, generate a new ssh key in a new file and add it wherever it is needed.

    Run the following commands on the terminal to generate the SSH key:

    ssh-keygen -t rsa -b 4096 -C "[email protected]"

    Then it will ask where to generate:

    Generating public/private rsa key pair. 
Enter file in which to save the key (/home/<NAME>/.ssh/id_rsa):

    Give the following name for the file

    /home/<NAME>/.ssh/id_rsa2

    And the last step is to add it to the file by the following command:

    ssh-add ~/.ssh/id_rsa2

  • Fix – Fatal: Not possible to fast-forward, aborting

    Fix – Fatal: Not possible to fast-forward, aborting

    To fix this issue run the following command to your repo:

    git pull --rebase

    And then do whatever you want to do.

  • go to particular commit in git

    Safe way to do this by creating a new branch with a particular commit hash.

    Here is an example:

    git checkout -b new_branch 6e559cb( replace with your hash )

    That’s it!!!

  • Git is not working after macOS Update

    Git is not working after macOS Update

    Yesterday I updated my macOS to latest Catalina version. After updating it GIT was not working. That always happens to me :-).

    I was getting following error.

    xcrun: error: invalid active developer path (/Library/Developer/CommandLineTools), missing xcrun at: /Library/Developer/CommandLineTools/usr/bin/xcrun

     

    Many of you might also get this error. So the solution is pretty simple. Just follow a couple of steps and solve the problem.

    Step 1: Open Terminal and run following command

    xcode-select --install

    Step 2: After this command, there will be a prompt to update the software. So update that.

    And wait for the software to be updated.

    That’s it.

     

    Ref: https://stackoverflow.com/questions/52522565/git-is-not-working-after-macos-update-xcrun-error-invalid-active-developer-pa

  • Edit old commit message on github

    Edit old commit message on github

    Sometimes we make mistake in git commit message, especially spelling mistake. Even though I think twice before pressing the enter key after I write the commit message, I made spelling mistake twice or thrice. That’s my bad actually and I accept it.

    So let’s start changing old commit message from GitHub. One thing you need to note that this will edit your commit message from the particular branch only.

    Step 1: Open terminal or ( cmd for windows user ) and go to the particular repository.

     

    Step 2: run command git log

     

    Step 3: Choose a commit message which you want to change and count on which position that commit message is. Let’s say it is on 6th position.

     

    Step 4: run git rebase -i HEAD~7

    by running this message you will get output something like this:

    pick 0856faf Message 1
pick 7ef84df Message 2
pick 55930c2 Message 3
pick 9bf24e0 Message 4
pick 412fc71 Message 5
pick 483f8b6 Message 6
pick c101979 Message 7

# Rebase 0c6220f..c101979 onto 0c6220f (7 command(s))
#
# Commands:
# p, pick = use commit
# r, reword = use commit, but edit the commit message
# e, edit = use commit, but stop for amending
# s, squash = use commit, but meld into previous commit
# f, fixup = like "squash", but discard this commit's log message
# x, exec = run command (the rest of the line) using shell
# d, drop = remove commit
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

    Note: HEAD~7 because we want to edit 6th commit message. For a safe side, we add one more message.

     

    Step 5: Change command pick to reword , as we only want to change the commit message. Like as shown below and exit ( ctrl+X )

    pick 0856faf Message 1
reword 7ef84df Message 2
pick 55930c2 Message 3
pick 9bf24e0 Message 4
pick 412fc71 Message 5
pick 483f8b6 Message 6
pick c101979 Message 7

( You can edit multiple messages too. )

    Note: There are other options that you can do for commits. Those options you can see right below your commit message list.

     

    Step 6: After that, you will be asked to change your commit message. So edit it and save it ( ctrl+x ).

     

    Step 7: Now run git push --force origin

    ( use –force is compulsary. Otherwise there will be double commit message )

    Note: During push it will show some warnings. Ignore it as it is warning 😉 . Sit back and relax.

     

    Yepieeeeeee. Your message is changed

    If you have any issue then comment it. I will try my best to solve the issue.