---
chapter: Hot Tips
layout: slide
tags: ['advanced/hot-tips']
---

	# Use HEAD as conflict resolution reference
	# (local file)
	git checkout --ours <file>`

	# Use upstream as conflict resolution reference
	# (incoming file)
	git checkout --theirs <file>` 
 

 