DEV Community

The Git Rebase Workflow

Rémi Lavedrine on June 20, 2019

Hi everyone, Looking for something totally different on the internet, I got to see that video about a "Git Rebase" workflow that is different from...
Collapse
 
linden profile image
Anders Lindén

This guide gives some good examples to start with
git-rebase.io/

Collapse
 
shostarsson profile image
Rémi Lavedrine

Thank you for sharing that link.
That is indeed very interesting. I started reading it, but I am going to spend some more time reading it later. :-)

Collapse
 
juancarlospaco profile image
Juan Carlos

I just do git pull --rebase --force

Collapse
 
shostarsson profile image
Rémi Lavedrine

Interesting. :-D

Collapse
 
seokjeon profile image
Se-ok Jeon

Thx for this! This is really what I wanted. Helped A LOT.
Can I translate in Korean this article? If you don't mind, I wanna share this awesome information in Korean. Surely, There will be a link directing to this original one.

Collapse
 
shostarsson profile image
Rémi Lavedrine

Hello,

Yes feel free to translate it. Link your article to the original one. :-)

Collapse
 
jessekphillips profile image
Jesse Phillips

Basically you want to only merge into mainline, rebase your working branch to get the latest from mainline.

Note this advice holds true if you have multiple mainlines. Merge across mainlines.

Collapse
 
vlasales profile image
Vlastimil Pospichal

rebase master->feature
merge feature->master

Collapse
 
hiigami profile image
hiigami

I think this is oneflow workflow with option 1.
endoflineblog.com/oneflow-a-git-br...

Collapse
 
myerschris78 profile image
Chris Myers

This is the article that helped me learn about rebase. I still use it today.

gist.github.com/alper/846c187892fe...

Collapse
 
shostarsson profile image
Rémi Lavedrine

Thanks for sharing. 👍