It is possible to rename symbols in an object file using objcopy –redefine-sym old=new file (see man objcopy). Then just call the functions using their new names and link with the new object file.
You might be best off looking for a description of a 3-way merge algorithm. A high-level description would go something like this: Find a suitable merge base B – a version of the file that is an ancestor of both of the new versions (X and Y), and usually the most recent such base (although … Read more
i’m not quite familiar with your approach so I’ll show you a common way to help you out. First of all, on your output, you are specifying the filename to app.js which makes sense for me that the output will still be app.js. If you want to make it dynamic, then just use “filename”: “[name].js”. … Read more
Just grep through the working directory and send the output through the xargs command: grep -lr ‘<<<<<<<‘ . | xargs git checkout –ours or grep -lr ‘<<<<<<<‘ . | xargs git checkout –theirs How this works: grep will search through every file in the current directory (the .) and subdirectories recursively (the -r flag) looking … Read more
Well, its not technically managing conflicts with submodules (ie: keep this but not that), but I found a way to continue working…and all I had to do was pay attention to my git status output and reset the submodules: git reset HEAD subby git commit That would reset the submodule to the pre-pull commit. Which … Read more
TL;DR; To summarize (As Benubird comments), when: git checkout A git rebase B # rebase A on top of B local is B (rebase onto), remote is A And: git checkout A git merge B # merge B into A local is A (merge into), remote is B A rebase switches ours (current branch before … Read more
git checkout has the –ours option to check out the version of the file that you had locally (as opposed to –theirs, which is the version that you pulled in). You can pass . to git checkout to tell it to check out everything in the tree. Then you need to mark the conflicts as … Read more
Say you and your friend both checked out a file, and made some changes to it. You removed a line at the beginning, and your friend added a line at the end. Then he committed his file, and you need to merge his changes into your copy. If you were doing a two-way merge (in … Read more
From API level 17 and above, you can call: View.generateViewId() Then use View.setId(int). If your app is targeted lower than API level 17, use ViewCompat.generateViewId()