3 ms·

Merge conflicts only happen when the commits happen on the same line, presumably a novel is larger than a line. So there shouldn't be a problem after a while.

Merge conflicts only happen when the commits happen on the same line, presumably a novel is larger than a line. So there shouldn't be a problem after a while. Maybe you were making a joke... actually you were probably making a joke. You were making a joke. Sorry.

stevebmark 11y ago
Not a joke. People will be appending text to the end of the file constantly. Git usually conflicts when two people modify the end of a file. Merging one PR will invalidate every other PR. Edit: even the very first two pull requests conflicted. https://github.com/why-el/crowd-written-novel/pull/2 https://github.com/why-el/crowd-written-novel/pull/2 "This pull request contains merge conflicts that must be resolved." Probably a critical flaw in this project.
- GhotiFish 11y ago
  Might be a bit early to tell how that's going to play out. Personally I wouldn't expect concatenations to be the majority of work, but more fill in the blanks and fleshing out of details. That's just my guess though. edit response: It's just starting out! There's only one sentence! This is not confirmation of your statement.
  - stevebmark 11y ago
    The first five pull requests have been text additions and 4/5 have conflicted looks like. I don't know why you assume more people would edit a novel than write to it.
    - hauget 11y ago
      Editing's going to be a nightmare...
- why-el 11y ago
  What would be your suggestion to improve it?
  - stevebmark 11y ago
    You could break up the files into lots of chapters, but then if someone wants to inject a chapter they'd have to rename the one after it. I don't see a good solution. It's a limitation of git, or any VCS really. How would any VCS know how to handle two different appends to the end of a file? All changes are dependent on the previous change, which means PRs can only be written in serial. Fundamentally version control is a bad choice for this type of project. It would be better as a website or something that put you in a queue for additions. This project looks like it will be unmaintainable.
    - GhotiFish 11y ago
      I maaassiiivly disagree with this. The larger the project gets the easier individual edits will be. I'm a pessimist by nature but this is going too far.
      - GhotiFish 11y ago
        can... someone explain what is going on here? projects do suffer less merge conflicts the larger they are, and stevebmark is literally declaring this project as a whole unmaintainable from the word go, and his proof is that the story started with one line, and the pull requests to get the story off the ground are conflicting. I don't understand what's going on here, I don't understand how anyone can support this position. This is crazy! I am very confused!
    - wingerlang 11y ago
      Or just add [End of file, don't write below this line] or [The end] at the bottom.
- deleted 11y ago
  [deleted]

stevebmark 11y ago

Not a joke. People will be appending text to the end of the file constantly. Git usually conflicts when two people modify the end of a file. Merging one PR will invalidate every other PR. Edit: even the very first two pull requests conflicted. https://github.com/why-el/crowd-written-novel/pull/2 https://github.com/why-el/crowd-written-novel/pull/2 "This pull request contains merge conflicts that must be resolved." Probably a critical flaw in this project.

GhotiFish 11y ago
Might be a bit early to tell how that's going to play out. Personally I wouldn't expect concatenations to be the majority of work, but more fill in the blanks and fleshing out of details. That's just my guess though. edit response: It's just starting out! There's only one sentence! This is not confirmation of your statement.
- stevebmark 11y ago
  The first five pull requests have been text additions and 4/5 have conflicted looks like. I don't know why you assume more people would edit a novel than write to it.
  - hauget 11y ago
    Editing's going to be a nightmare...
why-el 11y ago
What would be your suggestion to improve it?
- stevebmark 11y ago
  You could break up the files into lots of chapters, but then if someone wants to inject a chapter they'd have to rename the one after it. I don't see a good solution. It's a limitation of git, or any VCS really. How would any VCS know how to handle two different appends to the end of a file? All changes are dependent on the previous change, which means PRs can only be written in serial. Fundamentally version control is a bad choice for this type of project. It would be better as a website or something that put you in a queue for additions. This project looks like it will be unmaintainable.
  - GhotiFish 11y ago
    I maaassiiivly disagree with this. The larger the project gets the easier individual edits will be. I'm a pessimist by nature but this is going too far.
    - GhotiFish 11y ago
      can... someone explain what is going on here? projects do suffer less merge conflicts the larger they are, and stevebmark is literally declaring this project as a whole unmaintainable from the word go, and his proof is that the story started with one line, and the pull requests to get the story off the ground are conflicting. I don't understand what's going on here, I don't understand how anyone can support this position. This is crazy! I am very confused!
  - wingerlang 11y ago
    Or just add [End of file, don't write below this line] or [The end] at the bottom.
deleted 11y ago
[deleted]