Closed NiklasBuchfink closed 6 months ago
@felix.haeberle You raised this issue.
It is complicated to resolve this:
Possible proposals
IMO 2. is the way to go for now. Let the 2% flag their repo in the settings and force the 98% to use PRs non-techs need to learn this process. In the long run, we need those flags in the SDK and redesign the pull request flow in a way that users don't need to think about it because it happens in the background.
After a few more thoughts.
Ideal UX
If I'm part of the team, I open the project, make my changes and it should be commited, when I'm done. (To support autosaving, these changes are collected and commited, when the user is done. The lix server might help with that in the future. Also for live collaboration)
I just open the file, make my changes and click request changes, if I'm not part of the team. The team is notified and can decide to add this changes. (fork + pr workflow in the background)
If I want this file to diverge, I want to click copy. Maybe I we can offer features like, "get updates from the original" or "merge documents", but since the copy action was done, we don't assume PRs anymore and users explicitly state that the copy should be updated or merged with main. (same forking + pr workflow as well, but with explicit user actions)
@niklas.buchfink is this not partially
solved by our conditional modal that allows deactivating notifications about diverging forks? if i activate this it is a frok that should diverge, if not i want to usually contribute back eventually.
i always see there are these options after making changes in fink:
@jan.johannes You are right; we can use the tick from the modal as a condition for this flow 👍
The "Ideal UX" I illustrated above is an idea of hiding much of the git-specific workflows and terms from non-technical users and creating something they can understand. Does this make sense for an app contribution workflow for non-techs (in the long term)?
I implement the suggested behaviour that no pull request status is displayed in the LixFloat if the user has ticked to deactivate notifications about diverging forks.
Maintainers can push directly, they don't need to open a PR