GIT - 5

  How to create Branch, Merge & Stash

============================================

 _____0 branch (little branch)

|(start)

0--------------0------0---------------0 (master)

master      commit   commit    |

                               |_______0______0_____0(big features)



The diagram above visualizes a Repository with two isolated lines of development, one for a little features, and one for a longer-running features. By developing them is Branches, it's not only possible to work on both of them in parallel but it also keeps the main master branch free from error.


-> Each task has one separate branch.

-> After done with code, Merge other branches with master.

-> This concept is useful for parallel developments.

-> you can create any no. of branches.

-> changes are personal to that particular branch.

-> default branch is 'Master'

-> files created in Workspace will be visible in any of the branch workspace untill you commit. Once you commit, then that files belongs to that Particular Branch.

-> when created new branch, data of existing branch.

Comments

Post a Comment

Popular posts from this blog

GIT - 3

 How to use git and create github account ========================================= AWS account-> create two EC2 instance (Linux) allow ssh and http port in security group. on first machine. ================ -> sudo su  -> yum upate -y -> yum install git -y -> git --version  or which git -> git config --global user.name "bhupinder" -> git config --global user.email "bhupinder@gmail.com" -> git config --list on second machine ================= -> sudo su  -> yum upate -y -> yum install git -y -> git --version  or which git -> git config --global user.name "Ajay" -> git config --global user.email "Ajay@gmail.com" -> git config --list
Read more

Docker - 6

 How to psuh docker image in dockerhub ===================================== Now go to putty -> Login as -> Sudo su -> yum update -y -> yum install docker -y -> service docker start -> docker run -it ubuntu /bin/bash Now create some files inside container Now create image of this container -> docker commit container1 image1 Now create account in hub.docker.com Now go to your server -> docker login -> enter your username and password Now give tag to your image -> docker tag image1 docker id/newimage -> docker push dockerid/newimage Now you can see this iamge in docker hub account Now create one instance in tokyo region and pull image from hub -> docker pull dockerid/newimage -> docker run -it --name mycon dockerid/newimage /bin/bash Some Important commands ===================== 1) Stop all running containers: docker stop $(docker ps -a -q) 2) Delete all stopped containers: - docker rm $(docker ps -a -q) 3) delete all images:- docker rmi -f $(do...
Read more

GIT - 1

 Introduction of GIT ==================== software configuration management   or source code management a) Centralised version control system b) Distributed version control system CVCS ---- drawbacks: --------- 1) It is not locally available, meaning you always need to be connected to a network to perform any action. 2) since everything is centralised, if central server gets failed, you will lose entire data. Eg- SVN tool. DVCS ---- In distributed version control system, every contributor has a local copy or 'clone' of the main repository. I.e. everyone maintains a local repository of their own which contains all the files and metadata present is Main repository. Difference between CVCS and DVCS CVCS ----- 1) In Cvcs, a client need to get local copy of source from server, do the changes and commit those changes to central source of server. 2) CVCS  system are easy to learn and setup. 3) working on braches is difficult in cvcs developer often  faces merge con...
Read more