You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		2 years ago
..
agit	Propagate context and ensure git commands run in request context (#17868)	2 years ago
asymkey	Propagate context and ensure git commands run in request context (#17868)	2 years ago
attachment	Simplify parameter types (#18006)	3 years ago
auth	Use `ImagedProvider` for gplus oauth2 provider (#18504)	2 years ago
comments	format with gofumpt (#18184)	2 years ago
cron	format with gofumpt (#18184)	2 years ago
externalaccount	Refactor auth package (#17962)	3 years ago
forms	Add packagist webhook (#18224)	2 years ago
gitdiff	Fix partial cloning a repo (#18373)	2 years ago
issue	format with gofumpt (#18184)	2 years ago
lfs	Refactor jwt.StandardClaims to RegisteredClaims (#18344)	2 years ago
mailer	Pause queues (#15928)	2 years ago
migrations	add test coverage for original author conversion during migrations (#18506)	2 years ago
mirror	Pause queues (#15928)	2 years ago
org	Move repository model into models/repo (#17933)	3 years ago
pull	Detect conflicts with 3way merge (#18536)	2 years ago
release	format with gofumpt (#18184)	2 years ago
repository	Pause queues (#15928)	2 years ago
task	Pause queues (#15928)	2 years ago
user	Move keys to models/asymkey (#17917)	3 years ago
webhook	Add packagist webhook (#18224)	2 years ago
wiki	Propagate context and ensure git commands run in request context (#17868)	2 years ago