Name |
Last commit
|
Last update |
---|---|---|
.. | ||
trees | ||
workdir | ||
conflict_data.h | ||
driver.c | ||
files.c | ||
merge_helpers.c | ||
merge_helpers.h |
Our virtual commit must be the last argument to merge-base: since our algorithm pushes _both_ parents of the virtual commit, it needs to be the last argument, since merge-base: > Given three commits A, B and C, git merge-base A B C will compute the > merge base between A and a hypothetical commit M We want to calculate the merge base between the actual commit ("two") and the virtual commit ("one") - since one actually pushes its parents to the merge-base calculation, we need to calculate the merge base of "two" and the parents of one.
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
trees | Loading commit data... | |
workdir | Loading commit data... | |
conflict_data.h | Loading commit data... | |
driver.c | Loading commit data... | |
files.c | Loading commit data... | |
merge_helpers.c | Loading commit data... | |
merge_helpers.h | Loading commit data... |