How to update your GIT master branch with the changes made to other branches?

First step you need to do is:
  •  git checkout master
  •  git pull
This will make sure you have the latest code from the github repository for the master branch.
Now, you want to rebase your branch on top of the master branch.
  •  git checkout branch_name
  •  git rebase master
If you want you can do an interactive rebase (git rebase -i master) and squish your commits into a single commit.  You may also have to resolve conflicts with other work that has been done since you branched off of master.

Once you've done the rebase, you can then merge your changes into the master branch:
  •  git checkout master
  •  git merge branch_name
Then you need to push your changes up to the remote branch so anyone can pull them down:
  • git push origin master
That's it you have successfully updated your master with the latest changes in the branch...!!!
 

Comments

Post a Comment

Popular posts from this blog

How to SSH to remote server without entering password each time.

ssh -copy-id  example_user@www.example.com and give password once. Then you will be able to ssh without password next time onwards. Make sure you have a ssh key generated in your local machine. This works for Linux only (not Mac, Windows etc.) For Mac you need to first setup ssh-copy-id command & then copy the ssh key sudo curl https://raw.githubusercontent.com/beautifulcode/ssh-copy-id-for-OSX/master/ssh-copy-id.sh -o /usr/local/bin/ssh-copy-id sudo chmod +x /usr/local/bin/ssh-copy-id ssh-copy-id -i /path/id_rsa.pub example_user@www.example.com   Now you have your ssh-key copied to your server. You can now try your normal ssh login command without entering password
Read more

How to redirect a URL in NGINX

How to redirect a http://test.com to http://www.com Your main server block will be like server {             listen       80;             server_name  www.test.com;             client_max_body_size   10M;             client_body_buffer_size   128k;             root       /home/test/test/public;             passenger_enabled on;             rails_env production;             error_page   500 502 503 504  /50x.html;             location = /50x.html {                     root   html;             }     } Then add a new server block with the below code. server {         server_name test.com;         return 301 $scheme://www.test.com$request_uri; } You are done!
Read more

Ruby on Rails Installation on Windows 7

Image
Get Ruby and the Development kit from here (this is one click installer) by default you install Ruby and Ruby Gems Next is to set the system environment variable. Quickest way: Open the control panel, search for 'environment', then click ' edit the system environment variables ' , and add the bin(c:\Ruby 187\bin) after a semicolon to the 'Path' variable.          Now type ruby -v in cmd prompt, you could see the ruby version installed. Our next aim is to install Rails. use gem install rails --include-dependencies . Check your rails version too rails -v . You could see the latest rails version installed. Installing Rmagick and ImageMagick. Download the rmagick-win32 package (zip file) . Install the gem by going into the directory it’s extracted into and then executing this: gem install rmagick-2.10.0-x86-mswin32.gem Then install ImageMagick itself, with the .exe that you just extracted as well. Getting started with a samp
Read more