recaptime.dev / phorge
@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.) hq.recaptime.dev/wiki/Phorge
phorge phabricator
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Automatically resolve merge conflicts in Celerity map

Summary:
We can use `.gitattributes` instead but there's no way how to set repository config for all users in Git, right?
So provide a script writting to `.git/info/attributes` instead so that we don't have to .gitignore `.gitattributes`.

Test Plan:
$ scripts/celerity/install_merge.sh
$ git pull # with merge conflict in Celerity map

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D3228

vrana 80d9a276 af0a3992

+18
+9
scripts/celerity/install_merge.sh
··· 1 + #!/bin/sh 2 + 3 + echo "src/__celerity_resource_map__.php merge=celerity" \ 4 + >> `dirname "$0"`/../../.git/info/attributes 5 + 6 + git config merge.celerity.name "Celerity Mapper" 7 + 8 + git config merge.celerity.driver \ 9 + '$GIT_DIR/../scripts/celerity_mapper.php $GIT_DIR/../webroot'
+9
src/docs/developer/adding_new_css_and_js.diviner
··· 58 58 don't, but they might start not working as well in the future if you skip this 59 59 step. 60 60 61 + The generated file `src/__celerity_resource_map__.php` causes merge conflicts 62 + quite often. They can be resolved by running the Celerity mapper. You can 63 + automate this process by running: 64 + 65 + phabricator/ $ ./scripts/celerity/install_merge.sh 66 + 67 + This will install Git merge driver which will run when a conflict in this file 68 + occurs. 69 + 61 70 = Including a File = 62 71 63 72 To include a CSS or JS file in a page, use