bbang: 인 마이 케이스 커밋 전 git pull을 땡겼는데 conflict 때문에 pull이 안된다 -> 작업사항 git stash 하고 git pull -> git stash pop 후 conflict 항목 비교 후 수정

Syntax	Description	Examples
`"` keyword `"`	Finds the string within quotes, including spaces. Case-insensitive. (Escape quotes inside with `\"`)	`"Hackers' Pub"`
`from:` handle	Finds content written by the specified user.	`from:hongminhee` `from:hongminhee@hollo.social`
`lang:` ISO 639-1	Finds content written in the specified language.	`lang:en`
`#` tag	Finds content with the specified tag. Case-insensitive.	`#HackersPub`
condition condition	Finds content that satisfies both conditions on either side of the space (logical AND).	`"Hackers' Pub" lang:en`
condition `OR` condition	Finds content that satisfies at least one of the conditions on either side of the OR operator (logical OR).	`#HackersPub OR "Hackers' Pub" lang:en`
`(` condition `)`	Combines the operators within the parentheses first.	`(#HackersPub OR "Hackers' Pub" OR "Hackers Pub") lang:en`

bbang @minju2996@hackers.pub

9/15/2025, 6:00:02 AM

Public

인 마이 케이스

커밋 전 git pull을 땡겼는데 conflict 때문에 pull이 안된다

-> 작업사항 git stash 하고 git pull

-> git stash pop 후 conflict 항목 비교 후 수정

If you have a fediverse account, you can reply to this note from your own instance. Search https://hackers.pub/ap/notes/01994bf5-777f-798a-af0a-7ce98586f241 on your instance and reply to it.