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
Add an "upstream" empty commit to the subproject branch
Assimilate subproject branch
Split out the assimilated commits
The empty commit vanishes from the round-trip split out commits. Subsequent commits will all have different hashes. Assimilate needs to detect these and complain. With some statefulness, like a .gitsubhistory folder or something, we could potentially toggle a file in there, though that seems kinda hacky.
The text was updated successfully, but these errors were encountered:
To repro:
The empty commit vanishes from the round-trip split out commits. Subsequent commits will all have different hashes. Assimilate needs to detect these and complain. With some statefulness, like a
.gitsubhistory
folder or something, we could potentially toggle a file in there, though that seems kinda hacky.The text was updated successfully, but these errors were encountered: