rebase 1 commit (bong borey)

git checkout master
git fetch
git reset --hard origin/master
git checkout -b new-structure-data
git merge --squash structured-data-for-search-results
(resolve conflict & add .)
git rebase -i HEAD~2 
git push -f origin new-structure-data

-- credit : bong Borey Lim
branch new-customer 
branch master 

1. merge master into new-customer 
2. resolve conflict 
3. git ci 
4. git co master 
5. git co -b aa 
6. git merge --squash new-customer 
7. git ci 
8. type 'v' -> down arrow(for selection in vim) 
9. type 'd' to delete selected content 
10. type the one commit 
11. remove old branch "new-customer" 
12. git co -b new-customer 
13. git push -u origin new-customer -f
-- bong mony

git config --global core.editor /usr/bin/vim