Skip to main content

Timeline for Git workflow and rebase vs merge questions

Current License: CC BY-SA 4.0

14 events
when toggle format what by license comment
S Jan 5, 2020 at 20:40 history suggested James Wright CC BY-SA 4.0
Putting the *correct* new addresses for the previously broken links
Jan 5, 2020 at 20:22 review Suggested edits
S Jan 5, 2020 at 20:40
S Jan 5, 2020 at 19:22 history suggested James Wright CC BY-SA 4.0
Update broken links
Jan 5, 2020 at 19:15 review Suggested edits
S Jan 5, 2020 at 19:22
May 23, 2017 at 11:55 history edited URL Rewriter Bot
replaced http://stackoverflow.com/ with https://stackoverflow.com/
May 9, 2012 at 20:09 comment added VonC @dtan what I describe here is rebasing local on top of master. You not exactly updating the local history, but rather re-applying local history on top of master in order to solve any conflict within the local branch.
May 9, 2012 at 19:03 comment added hellatan just to get it straight, rebasing from the master branch onto your local is basically to update any history your local may have missed that the master has knowledge of after any sort of merge?
Jun 22, 2011 at 23:32 history edited David Underhill CC BY-SA 3.0
minor wording tweak
Mar 9, 2011 at 11:41 history edited VonC CC BY-SA 2.5
add barraponto's links
Mar 9, 2011 at 11:27 comment added Capi Etheriel randyfay.com/node/91 and randyfay.com/node/89 are wonderful reads. these articles made me understand what was worng with my workflow, and what an ideal workflow would be.
Aug 13, 2009 at 14:15 comment added mhagger For a technique that allows rebasing and sharing, see softwareswirl.blogspot.com/2009/04/…
May 25, 2009 at 18:40 history edited Léo Léopold Hertz 준영 CC BY-SA 2.5
deleted 4 characters in body
Jan 22, 2009 at 19:06 vote accept Micah
Jan 19, 2009 at 15:32 history answered VonC CC BY-SA 2.5