> c) there is some issue (please explain more) with bpf.tcpdump.org
> experiencing auto-merging difficulties.
When a repository exists in two copies and each copy has the same branch (i.e.
master) and some new commits go to that branch in one copy but not the other,
and also the other way around, the branches will look like this (this is how
GitHub and bpf.tcpdump.org look right now):
a-b-c-d-e-m-n-t
a-b-c-d-e-x-y-z
Then git-merge in any of the directions will not be fast-forward and will
require explicit merge commits and sometimes conflict resolution. That is
additional work for no gain. If instead the copies get converged first and then
new commits go to one copy only, the other copy will always enjoy fast-forward
pulls, making it possible to run git-pull every 15 minutes from crontab.
--
Denis Ovsienko
_______________________________________________
tcpdump-workers mailing list
tcpdump-workers@lists.tcpdump.org
https://lists.sandelman.ca/mailman/listinfo/tcpdump-workers
