Updating the currently checked out branch may cause confusion

This is handled by reverse adjusting commits one at a time and rebasing the others on top.

, with the goal of merging origin/master into master, and updating adjusted/master.

This is would mostly be confusing when git-annex init switched into the adjusted branch due to lack of symlink support. For #2 above it would omit files whose content is not currently in the annex. The function is currently implemented as the git-annex-adjust command. For #1 above it would simply convert all annex symlinks to annex file pointers.It would be fine if only re-adjusted the branch one time at the end.OTOH, when should the assistant re-adjust the branch?

Leave a Reply