Git cherry pick a merge commit code#
This is when I encountered problems, although the code worked as intended, appended the files in leaf to those in phone, it did not do so without behaving in two ways that weren't intended.įirstly, it seemed to ignore the -X subtree argument and tried to merge in greedy fashion. Git merge -no-commit -X subtree=diary leaf gitattributes as I've shown above, but here I needed to only copy over files from the diary folder. I had tested the git merge -no-commit on another repository going through the steps to make sure it respected the rules in my. I then commited these changes to my leaf branch and was ready to merge them into the phone branch. It appended, suffixed foldmarkers to the files I need to merge.
Git cherry pick a merge commit driver#
I searched for a way to create a driver to do this, and when I couldn't resolved a simple for loop that I suppose is part of the linux philosophy. Git fetch ssh://.XX/path/to/path/to/home/.git-repos/vimwiki stem:leafįrom this point I had created a branch to merge into, phone, and fetched the vimwiki repo into another branch leaf.Īn interesting hurdle in this process was my desire to have the in congruencies visible after the merge. On Computer A, I ran: git checkout -b phone Git commit -m 'added entries since last log, including need diaries' On computer B, I ran: git checkout -b stem path/to/vimwiki/Īfter having staged the objective thus far, I made some preparations to merge the two repos. For this reason I wished to merge only the files under folders poetry, and diary. The database on Computer A, as it's name suggests, has been given many more commits than it's counterpart on B. Name = aggregate both new sections for diary entriesĭriver = git merge-file -union -L %P %A %O %BĪt this point the history of the two repos is important. git/config, and (2.), specifying rules for that merge driver in a.
To combat this nearing catastrophe I have read up a bit on merge strategies, and followed answers to other stack overflow posts, specifically this ( strategy for git and append-mostly files ), developing a schema to append differing files to one another. This is presumedly because they have no commonĪncestor, are the same file on both systems in namespace, and have no common lines. Follow this pattern for a year and I will have 364 merge conflicts on new year's day. Within 24 hours git will give me a merge conflict for that day. When running VimwikiMakeDiaryNote, the pluginĬommand, vimwiki creates a filename using date +%F under the diary folder, and if I use this command on each computer For the most part this isn't a problem, but vimwiki diary structure contains a funny quirk that does create a conflict. On each computer, for a long time I typically ignore commits and make changes freely, and the two repos are isolated from each other. To complicate matters each computer has it's own local database, or DVCS database (Something I just learned).
I then have this repo locally stored on two machines, one at work, and I use a git repo to store my vimwiki, a personal wikipedia which houses diaries, some latex, but mostly markdown wiki files.
0 kommentar(er)
