Forcing git to merge add/add "conflicts" -
ages ago installed moodle tarball , have been customizing in private git repo ever since (mostly via modules, i'm not 100% sure never changed base code). want integrate upstream repo in way let me updates while preserving change history, , notify me if i've made changes conflict base code.
my problem when try merge in remote repository, git doesn't understand 2 repos contain same code, , treats every file add/add conflict. want make git merge these anyway, , leave actual conflicts me deal with.
what i've done far:
- git add remote moodle git://git.moodle.org/moodle.git
- git fetch moodle
- git checkout -b upstream_sync v2.2.1 # tag version on repo based (it seemed prudent sync'd first, start pulling down later updates; maybe that's not necessary, though?)
- git merge master
example output git merge (i see every file):
auto-merging admin/process_email.php conflict (add/add): merge conflict in admin/process_email.php
i go git mergetool , review every merge manually, i'd avoid tedium. in advance can help!
Comments
Post a Comment