bruno/ifcurl
1
0
Fork 0
mirror of https://github.com/brunopostle/ifcurl.git synced 2026-07-12 10:18:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
ifcurl/forgejo/server-config
History
Bruno Postle 8e474f2629 gitconfig-ifcmerge: use --prioritise-local correctly per merge direction 
ifcmerge defaults to preserving remote IDs; --prioritise-local preserves local
IDs instead.  For Forgejo merge commits, %A is main (local) so ifcmerge_ours
(--prioritise-local) is the right driver — main's IDs are preserved and the
PR branch is renumbered.  For developer rebases from main, %B is main (remote)
so the plain ifcmerge driver (no flag) preserves main's IDs by default.

Update /etc/gitattributes to use ifcmerge_ours for server-side merges, and
update README with a direction table clarifying which driver to use when.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-25 07:41:49 +01:00
..
gitattributes gitconfig-ifcmerge: use --prioritise-local correctly per merge direction 2026-04-25 07:41:49 +01:00
gitconfig-ifcmerge gitconfig-ifcmerge: use --prioritise-local correctly per merge direction 2026-04-25 07:41:49 +01:00
ifcurl-preview.service ifcurl-preview.service: fix cache path for non-root service user 2026-04-24 21:48:58 +01:00