GIT MERGE
Merging changes from feature_branch to develop
- Get latest from develop and merge to feature_branch
git checkout develop
git pull
git checkout feature_branch
git merge --no-ff origin develop
Note : To be safe from conflict with develop(GOOD PRACTICE), we will resolve in feature_branch
- Merge feature_branch to develop
git checkout develop
git merge --no-ff origin feature_branch
Posts on git
Related Post:
K8s Contributor Playground, Learning by Contributing
Adding Try in PWD button to README file
Open JDK docker container commands shell access to the container
AWS EBS Volmes - Create and attach the EBS volume with mounting
Elasticsearch - Dumping documents from multi-node to single node