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.

Required fields*

Rev

I'm trying the Git upstream method. I made a copy of the repo and set an upstream remote pointing back to the original. Then I just merge upstream/master into the copy's master. So it seems no different than normal merging.

Ryan
– Ryan

2019-11-01 00:49:31 +00:00
Commented Nov 1, 2019 at 0:49
@Ryan exactly; this is why it is not a good idea that user just changes the code as desired: sooner or later merge conflicts will occur. Therefore, design the code so as to avoid that customer wants to change it in his fork (relying on language semantics rather that git’s text processing). This is safe, and it’s the underlying philosophy to a lot of package managers. If changes can really not be avoided in some file, then, at least isolate the changeable parts in clearly idenfified sections of your source file and provide instructions on how to solve the merge conflicts.

Christophe
– Christophe

2019-11-01 09:09:30 +00:00
Commented Nov 1, 2019 at 9: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 »