I'm experimenting with using GIT for job application materials. The dream is to have a main branch with the base version of my application, and then branch off many specialized versions (updating the cover letter, changing the DEI statement, perhaps emphasizing different past projects, etc.) for each job. It's possible (even likely) that I will find typos as I work on the specialized branch versions, and it would be nice to merge only those fixes back into the base version (while not merging the specialized changes).
What's a good way to do that?
I thought this was an ideal application of difftool, but usually I'm on a branch that just started, so auto merge will copy all changes to the file into main, which I don't like. One can use patches to pick out the right change, but I find learning the interactive patch to be pretty tedious. I'm told Cherry-pick should do this, though an initial test suggests that it is not straightforward? At least I got scared by the ensuing wall of hints. My favorite so far is to checkout the changed file from the specialized branch into main, then detach it and use the difftool, but I really think I should be able to get that state in one short command.
Anyone have thoughts?
=> More informations about this toot | View the thread
=> This profile with reblog | Go to drScott@mathstodon.xyz account This content has been proxied by September (3851b).Proxy Information
text/gemini