zeripath 92e81e97e8 Detect conflicts with 3way merge (#18536) ... * Detect conflicts with 3way merge 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> * and three-way failed Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>		2022-02-02 12:46:10 +08:00
..
agit	Propagate context and ensure git commands run in request context (#17868)	2022-01-19 23:26:57 +00:00
asymkey	Propagate context and ensure git commands run in request context (#17868)	2022-01-19 23:26:57 +00:00
attachment	Simplify parameter types (#18006)	2021-12-20 04:41:31 +00:00
auth	Use ImagedProvider for gplus oauth2 provider (#18504)	2022-02-01 01:02:56 +01:00
comments	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
cron	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
externalaccount	Refactor auth package (#17962)	2022-01-02 21:12:35 +08:00
forms	Add packagist webhook (#18224)	2022-01-23 21:46:30 +08:00
gitdiff	Fix partial cloning a repo (#18373)	2022-01-23 22:19:32 +01:00
issue	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
lfs	Refactor jwt.StandardClaims to RegisteredClaims (#18344)	2022-01-20 22:52:56 +01:00
mailer	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
migrations	add test coverage for original author conversion during migrations (#18506)	2022-02-01 13:20:28 -05:00
mirror	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
org	Move repository model into models/repo (#17933)	2021-12-10 09:27:50 +08:00
pull	Detect conflicts with 3way merge (#18536)	2022-02-02 12:46:10 +08:00
release	format with gofumpt (#18184)	2022-01-20 18:46:10 +01:00
repository	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
task	Pause queues (#15928)	2022-01-22 21:22:14 +00:00
user	Move keys to models/asymkey (#17917)	2021-12-10 16:14:24 +08:00
webhook	Add packagist webhook (#18224)	2022-01-23 21:46:30 +08:00
wiki	Propagate context and ensure git commands run in request context (#17868)	2022-01-19 23:26:57 +00:00