-
git checkout master
-
git pull origin master
-
git checkout action_mailer
-
git merge master
-
solve all the conflicts if any
-
git push origin action_mailer
-
go to github.com, create pull request and merge it with master
-
git checkout master
-
git pull origin master
-
git checkout -b โXXXโ
angelavanessaa / airbnb Goto Github PK
View Code? Open in Web Editor NEWMy attempt to clone AirBnB