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

How to fix "username is not in the sudoers file" in debian

Hello fellow coders Recently I installed Debian-9 in my old laptop and tried to execute sudo command and I got above error saying that action will be reported. So today in this short post, I am going to tell you how to fix this problem. First, open your terminal and put su - Enter your password and then just type visudo This will openup a file with nano editor and it has few values, do not change any of them, just go to the line root ALL=(ALL:ALL) ALL and below it add a new line myuser ALL=(ALL) ALL save the file and then try to execute commands with sudo.. I hope this short post will save you a lots of times, in next blog I will bring you what are the meanings of these lines. Also a good Golang tutorial comming soon. Good Luck
Read more

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

A Go Journey - Part 1

Hello fellow coders, Merry Christmas and a Happy New Year!! I am about to start a fresh project with Golang. I will update the blog through out the project. Here I am going to create a simple blogging platform using Golang's micro-architecture just like I created using Laravel and Django . I just started Golang.  As I understood it sofar, we can call it as a combination of C and Python programming languages. It has the power of C with easy coding style like Python. For me, the most weirdest thing is variable/function declaration in Go. as an example, to define a string variable var myname string = "sachith" // function syntax func myfunction() string { return "Hello World" } a bit strange, isnt it? for variable definitions, there is a short method. myname := "sachith" Golang's capabilities and performances are the main attraction fo r this relatively new language. Golang is not considered as an O...
Read more