Git mistakes - 1

Git mistakes - 1

Hello Coders…

I hope you are having a great weekend. Today I am going to talk about My Git mistake.
I was working with a project where I tried to add opentracing to it (which is still not working properly).
First I created a new branch from my development branch using :

git checkout -b tracing
Then tried to add opentracing to it, there were many errors and I was fixing one by one and committed all the codes properly.

At certain point I had to revert my git branch to a previous commit I made. Then I was working on that. Didnt merge the commits back to original tracing branch.
When I try to merge them with my tracing branch, I was getting a lots of errors. Tried to fix them (merge conflicts), but they were not working as expected.

Finally I found a solution for this problem. This is kind of shortcut.

  1. Create a new branch from the current HEAD detached branch. Eg : git branch tmp git-hash-id

  2. Delete remote branch git push origin --delete tracing

  3. Delete local branch git branch -d tracing
    You will probably get an error :

    error: The branch ‘tracing’ is not fully merged. If you are sure you
    want to delete it, run ‘git branch -D tracing’

    And git is smart enough to give us the answer.
    git branch -D tracing

  4. Create a local branch called and checkingout to it tracing
    git checkout -b tracing

  5. Merge the codes from tmp branch. Eg : git merge tmp.

  6. Push new changes to newly created tracing branch in remote . Eg : git push origin tracing

Let me explain what is happening here.
First we create a new branch from currrent detached head.
Delete missed branch (locally and remote)
Create a new branch and merge code from tmp branch.
Push changes to remote server.

I am not a git expert, I am still learning them. This SO thread helped me to slove this issue.

Written with StackEdit.

Comments

Post a Comment

Popular posts from this blog

Youtube-dl cheatsheet

Youtube-dl cheatsheet Hello fellow coders… Today I am going to post something different. Its about a command-line based youtube downloader called youtube-dl . If you dont know about it, please go and check their homepage . This gives you instructions to install it correctly. So today I am going to post some cheats you will need to download best youtube videos quickly. One more important thing, there are no configuration settings to be done before or after installing youtube-dl . Downloading a single video When you need to download a single youtube video, you just type : youtube-dl youtube-video-url This will download the best quality video available. But if you can select specific video quality. I will describe it later. Downloading a playlist When you are interested about a certain youtube play list and want to download, youtube-dl gives an easy way to do it. You just have to use : youtube-dl -cit youtube-playlist-url Download specific videos from a ...
Read more

How to ask a question on StackOverflow

When we do coding we often face many problem. Theoretically ok code may not run in practical environment. So what we should do. First we can ask from our fellow coders near you. If they cant help you, what do you do? You must have checked StackOverflow. Most of the time, we go there just as a reader and read threads about similar problems. But what would happen if non of them help you. You have to ask a question. Here are some tips for asking a good question on StackOverflow. Its not for helping you to complete your homeworks. So never ask, I have to do this, how I can do it. First try something by yourself, even its a simple hello world program. Then ask your question with you used code, expected result and the actual result you got. When you ask a question, be simple and short, include only the necessary details to your question. Always give some details about your environment, such as your OS, software version. Be polite with the fellow coders who tries to help you there....
Read more

Advance usage of Sublime Text-3

          I am posting this for coding your life easily using Sublime Text -3. These are a few but helpful shortcuts every sublime user should know. I hope these will make your coding life very easy and comfortable. Note : => is not a key word, I just use it to show you what is the next step. 1) To find a file :          Keys            : ctrl+p  => File name.          Description : When you need to find a file inside your working directory and you know the                                   name of that file (at least a fraction of it). Else you have to use sidebar. 2) To get a method in a file :          Keys            : ctrl+p  => @ method         Description : When you need to find a method in...
Read more