- 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
Last active
July 28, 2023 01:45
-
-
Save febritecno/ebc3f3389e2a76620d5c5f209af00212 to your computer and use it in GitHub Desktop.
Liner commit tanpa rebase by febrian dwi putra
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
alias gisquash= 'git reset --soft HEAD~$(git rev-list --count HEAD ^master)'
git reset --soft "HEAD^" git commit --amend protips :[ use rebase -i and squash selected commit in the vi editor ]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment