febritecno/no-rebase.md

## no-rebase.md

      
    Raw
  

              no-rebase.md
            
          
    Linier commit, tanpa capek rebase !!!


create branch feature from master (important)
doing…. {a lot duplicate commit}
clone branch feature with name feat/{feature}-dev (tmp)
git rebase -i origin/master + squash (biar satu commit)
git push origin feat/{feature}-dev -f
create merge request / pull request to branch development


## rebase.md

      
    Raw
  

              rebase.md
            
          
    Linier commit, with rebase

Tutorial Git sourci ( Linier history commit )
remote MR + rebase

git pull development 
git checkout feat/32 <feat/32>
git rebase development <feat/32>
git rebase -i origin/development <feat/32>
fixup and pick 1 (commit ter-merge) <feat/32> (biar commit jadi 1 aja)
resolve conflict and change….
git push origin feat/32 -f <feat/32>
create mr to branch development (github)
merge!


cara solve1 branch conflict ruwet ketika di rebase


jika bisa disquash
compare change dari development

*squash/menindih all commits into one

alias gisquash=
'git reset --soft HEAD~$(git rev-list --count HEAD ^master)'
*combine 2 commit to 1 commit

git reset --soft "HEAD^"
git commit --amend
protips :[ use rebase -i and squash selected commit in the vi editor ]