Edit - Stack Overflow

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Rev

27

For a technique that allows rebasing and sharing, see softwareswirl.blogspot.com/2009/04/…
– mhagger
Commented Aug 13, 2009 at 14:15
2

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.
– Capi Etheriel
Commented Mar 9, 2011 at 11:27
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?
– hellatan
Commented May 9, 2012 at 19:03
@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.
– VonC
Commented May 9, 2012 at 20:09

Add a comment |

Correct minor typos or mistakes
Clarify meaning without changing it
Add related resources or links
Always respect the author’s intent
Don’t use edits to reply to the author

create code fences with backticks ` or tildes ~
```
like so
```
add language identifier to highlight code
```python
def function(foo):
print(foo)
```
put returns between paragraphs
for linebreak add 2 spaces at end
_italic_ or **bold**
indent code by 4 spaces
backtick escapes `like _so_`
quote by placing > at start of line
to make links (use https whenever possible)
<https://example.com>
[example](https://example.com)
<a href="https://example.com">example</a>

formatting help »
answering help »

Collectives™ on Stack Overflow