search

OpenlyOne / openly-rails

"GitHub" for Google Drive [inactive]
https://www.open.ly/
GNU General Public License v3.0
21 stars 1 forks source link

Contribution: Apply suggested changes relative to origin commit #325

Closed FinnWoelm closed 5 years ago

FinnWoelm commented 5 years ago

When calculating suggested changes in a contribution, calculate them relative to the contribution's origin revision — not the current latest revision in project — and do not overwrite any other files.

FinnWoelm commented 5 years ago

The implementation of this will be on a per-file basis as opposed to per-change basis.

That means any changes suggested to file A will overwrite all changes made to file A in master. Maybe A is renamed in contribution and modified master. The contribution will suggest the rename & unmodify the the file.

FinnWoelm commented 5 years ago

Resolved by #329