You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
A common operation is done by end users is to 'remix' a loadout.
Suppose the following:
A friend sends you their loadout
You make your adjustments to the loadout
Friend sends you an updated loadout
In this case, you may want to apply your friend's changes, while keeping yours.
Strategy
The general strategy is to start with your friend's updated loadout
Iterate both loadouts as long as they match.
then once we find the point of divergence
Apply remaining changes from your remixed 'Loadout B` until end.
i.e. in 'git' terminology, apply all commits past the point of branching.
Technical Problems
Merging 2 loadouts like this presents some problems with regards to mod load ordering;
there's no magically defined way in which 2 merged lists should be placed.
This is problematic, friend's loadout can add extra mods which we then won't have.
For the initial version, don't do any reordering; however do a validation pass.
At the end of the rebase, if the position of a mod changes relative to any other mod, log that;
so the user can fix up manually at the end.
e.g.
Mod A was before Mod C but is now after Mod C.
In a later implementation, we can show a mod list with just the mods whom changed positions relative to each other; the user can then rearrange them at the end of the rebase pass.
The text was updated successfully, but these errors were encountered:
Image embedded from Atlassian's Git Rebase Guide.
Objective
Tip
This change is powered by an user-end use case.
A common operation is done by end users is to 'remix' a loadout.
Suppose the following:
In this case, you may want to apply your friend's changes, while keeping yours.
Strategy
The general strategy is to start with your friend's updated loadout
then once we find the point of divergence
i.e. in 'git' terminology, apply all commits past the point of branching.
Technical Problems
Merging 2 loadouts like this presents some problems with regards to mod load ordering;
there's no magically defined way in which 2 merged lists should be placed.
This is problematic, friend's loadout can add extra mods which we then won't have.
For the initial version, don't do any reordering; however do a validation pass.
At the end of the rebase, if the position of a mod changes relative to any other mod, log that;
so the user can fix up manually at the end.
e.g.
Mod A
was beforeMod C
but is now afterMod C
.In a later implementation, we can show a mod list with just the mods whom changed positions relative to each other; the user can then rearrange them at the end of the rebase pass.
The text was updated successfully, but these errors were encountered: