Edit - Software Engineering Stack Exchange

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.

To clarify, when you say "merged into master", the goal of that is just to aggregate all the code changes, correct? I think I'm slightly confused since for topic branches, merging also means deleting the topic branch post-merge.

Sable Dreamer
– Sable Dreamer

2018-08-08 20:04:33 +00:00
Commented Aug 8, 2018 at 20:04
@SableDreamer Merging a branch b into master in the most general sense just means that all commits of b are now part of the history of master. Here such a merge is not strictly necessary, but it makes it more obvious that all work that was done for these releases is included on the master branch. This kind of merge is for us humans, not for git. We can use the git merge -s ours obsolete merge strategy to ignore any changes from the obsolete branch during a merge.

amon
– amon

2018-08-08 20:31:53 +00:00
Commented Aug 8, 2018 at 20:31
3

I would additionally point out that branches can be created from tags at any point in the future, should an unforeseen need arise, so you don't have to be 100% sure you won't ever need to add commits.

Karl Bielefeldt
– Karl Bielefeldt

2018-08-09 12:46:02 +00:00
Commented Aug 9, 2018 at 12:46

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 »