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.
-
i chose "method" because i could have GetEntityByCategory(long categoryId), which could be changed to GetEntityByCategory(long categoryId, bool excludeArchived) in one branch, and GetEntityByCategory(long categoryId, long subCategoryId) in another. With the (terrible) specifications we get for new features, it is not always possible to know that two specifications collide (this is a business issue, but not one that is easily resolved)... (more to follow)bizzehdee– bizzehdee2015-07-21 21:02:01 +00:00Commented Jul 21, 2015 at 21:02
-
If i merge Task 1 and 2 into Sprint, and task 2 conflicts, if i then rebase task 2, wouldnt i then end up consuming task 1 or at least part of task 1, and if task 2 ends up going into master first, features from task 1 will leak live before it is ready. how is this avoidable?bizzehdee– bizzehdee2015-07-21 21:03:01 +00:00Commented Jul 21, 2015 at 21:03
-
If task 2 is the one getting rebased, doesn't that mean task 1 has been merged "cleanly" without issue? The rebased task may need some rework but the merged task should be a perfectly releasable commit.Ixrec– Ixrec2015-07-21 21:06:27 +00:00Commented Jul 21, 2015 at 21:06
-
If task 1 is merged into sprint, that doesnt mean its live, it just means it is in the "beta" environment, it is only after task 1 has been tested good that a pull request is made from task 1 to master. but, if in the meantime, task 2 is merged into Sprint, and a conflict arises in that merge, a fix will be committed to Sprint rather than either of the task branches. Task branches will always be kept up to date with master, but never merged back from Sprint to avoid features from each task leaking. Sprint is where tasks go to get tested together. master is where they go to meet the publicbizzehdee– bizzehdee2015-07-21 21:11:48 +00:00Commented Jul 21, 2015 at 21:11
Add a 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