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*
-
2Your comment about rebasing having problems with merge resolution is not true. A rebase is the same kind of merge as an actual merge. Git is just merging commits under the hood. Rebasing and resolving a merge conflict doesn't damage the commit history. Rebasing and improperly resolving a merge conflict damages things, which is just as likely with a normal merge. I do have to agree that feature branches adds complexity, but this could be necessary complexity if developers must juggle multiple unrelated changes.Greg Burghardt– Greg Burghardt2014-09-03 15:23:57 +00:00Commented Sep 3, 2014 at 15:23
-
So you're saying that merges can destroy history?! Sounds like it's just more justification for avoiding having too many branches!RibaldEddie– RibaldEddie2014-09-03 15:27:37 +00:00Commented Sep 3, 2014 at 15:27
-
1Merges cannot destroy history. I think you might be misunderstanding how rebasing and merging works. When a merge conflict gets triggered, it is up to the human to resolve it. If the human resolves it incorrectly, you can't blame Git (or SVN, or CVS, or {insert source control here}).Greg Burghardt– Greg Burghardt2014-09-03 16:05:12 +00:00Commented Sep 3, 2014 at 16:05
-
Now what you're saying sort of conflicts with what you said before. Did you read the article I quoted from? Do you understand the context in which a rebase will lose history?RibaldEddie– RibaldEddie2014-09-03 16:06:57 +00:00Commented Sep 3, 2014 at 16:06
-
1I read the article. "At Keen we try to push our code after nearly each commit." That sounds crazy to me. Either they're making excessively big commits, or they're pushing out code that isn't ready yet. If you make all your commits public immediately, then yeah, rebasing will cause problems. It's the "Doctor, doctor, it hurts when I do this" principle.Kyralessa– Kyralessa2014-09-12 21:18:46 +00:00Commented Sep 12, 2014 at 21:18
|
Show 1 more comment
How to Edit
- 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
How to Format
-
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>
How to Tag
A tag is a keyword or label that categorizes your question with other, similar questions. Choose one or more (up to 5) tags that will help answerers to find and interpret your question.
- complete the sentence: my question is about...
- use tags that describe things or concepts that are essential, not incidental to your question
- favor using existing popular tags
- read the descriptions that appear below the tag
If your question is primarily about a topic for which you can't find a tag:
- combine multiple words into single-words with hyphens (e.g. design-patterns), up to a maximum of 35 characters
- creating new tags is a privilege; if you can't yet create a tag you need, then post this question without it, then ask the community to create it for you