merge conflicts
git checkout -b dev Switched to a new branch 'dev'
vim feature1.txt
git add feature1.txt
git commit -m "added feat -1 for dev"
git checkout master
Switched to branch 'master'
vim feature1.txt
git ad d feature1.txt
git co mmit -m "added master feat...
anasmansuri.hashnode.dev2 min read