Replies: 2 comments 4 replies
|
I'm not the one to ask about rebasing. I always seem to be confused and mess up. And I have not done that type of clear re-naming rebase that I recall so I guess just trying it with a single file in a local repo will give some experience. On the naming issue I have only one comment/question. What's the reason you want to go to Otherwise I think separating main files from included files (not intended to be beautified separately) is a good strategy. |
Renaming Went Well!Good news @thoni56, changing the extension in the ALAN Manual sub-files from Since Git identifies and tracks files by their SHA1 fingerprint, it doesn't really care about their names. In order words, all changes done in the Alpha Man branch will still refer to the same files, since rebasing will keep continuity of their unique file fingerprints being tracked along the history. My fear was that I often noticed that when a commit both renames a file and changes its contents a lot, the Git considers the renamed file a new one — but probably this only if you rename the files without using |
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
From main README:
In view of the upcoming adoption of Rake for a unified build toolchain, I would like to amend the above rules to:
.asciidoc.adocinclude::[]in main source..asc.adThis would simplify creating extension-based build rule in Rake.
Currently, some documents are using the
.asciidocext. for all files, so I'd like to make their split contents files use.adocinstead..adoc:One of such docs is the ALAN Manual, and I'm not sure whether renaming files in
masterand the rebasing the alpha-dev branch is going to work out or break up everything — of course, I can just try locally and, if thing go wrong, simply reset my branches to their remotes. But having never done this before with branches that apply lots of changes to the files being renamed, I wanted to ask you first, and wondered if you have experience and advise on this.After renaming the chapter files (changing their extension) in
master, and then rebasing the dev branch again, all those files should henceforth be renamed in all the dev branch commits too, since by rebasing we're replaying all those commits on top of the new renaming commit. The big question is whether Git will/can replay/adapt all dev-branch commits operations on those renamed files, instead of re-introducing them with their old names.The reason I'm asking this is because Git is now always good at detecting renamed files, especially if not renamed explicitly via
git mvor if contents are also changed at rename-time, leading Git to interpret the commit as a file deletion and new file addition. This would be disastrous in our case.Any suggestion, advice, concerns?
All reactions