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.

Required fields*

Rev

That's what I'm doing now, git rebase -i. It's a real headache because it plays back all the changes. I don't want that. Often the same piece of code is edited over and over and during a rebase I have to resolve conflicts over and over again when all I care about is the final version of master and how it compares to my branch. When I --merge it's a one step process. I just have to resolve the conflicts once. I'd like a rebase that is that easy. I didn't know about that diff ... command. That might help a lot. Thanks.

Walt Howard
– Walt Howard

2015-02-10 15:33:53 +00:00
Commented Feb 10, 2015 at 15:33

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