mirrors/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-01 06:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
forgejo/services
History
zeripath 0dfe5fa2d6
Detect conflicts with 3way merge (#18536) (#18537) 
Backport #18536

Unforunately git apply --3way reports conflicts differently than standard patches
resulting in conflicts being missed.

Adjust the conflict detection code to account for this different error reporting.

Fix #18514

Signed-off-by: Andrew Thornton <art27@cantab.net>
2022-02-02 14:35:25 +00:00
..
agit Fix various typos (#18219) 2022-01-10 17:32:37 +08:00
asymkey Refactor auth package (#17962) 2022-01-02 21:12:35 +08:00
attachment Simplify parameter types (#18006) 2021-12-20 04:41:31 +00:00
auth Use ImagedProvider for gplus oauth2 provider (#18504) (#18505) 2022-02-01 10:45:58 +08:00
comments Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
cron Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
externalaccount Refactor auth package (#17962) 2022-01-02 21:12:35 +08:00
forms Support webauthn (#17957) 2022-01-14 16:03:31 +01:00
gitdiff Fix various typos (#18219) 2022-01-10 17:32:37 +08:00
issue Restore propagation of ErrDependenciesLeft (#18325) 2022-01-19 00:26:42 +01:00
lfs Support webauthn (#17957) 2022-01-14 16:03:31 +01:00
mailer Add option to convert CRLF to LF line endings for sendmail (#18075) 2022-01-06 01:43:45 +01:00
migrations GitLab reviews may not have the updated_at field set (#18450) (#18461) 2022-01-30 14:56:39 +01:00
mirror Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
org Move repository model into models/repo (#17933) 2021-12-10 09:27:50 +08:00
pull Detect conflicts with 3way merge (#18536) (#18537) 2022-02-02 14:35:25 +00:00
release Set HeadCommit when creating tags. (#18116) 2021-12-29 19:40:57 +08:00
repository Stop trimming preceding and suffixing spaces from editor filenames (#18334) 2022-01-19 21:03:15 +00:00
task Some repository refactors (#17950) 2021-12-12 23:48:20 +08:00
user Move keys to models/asymkey (#17917) 2021-12-10 16:14:24 +08:00
webhook Add replay of webhooks. (#18191) 2022-01-05 15:00:20 -06:00
wiki Fix various typos (#18219) 2022-01-10 17:32:37 +08:00