Stack Exchange
log in
chat
meta
about
Stack Exchange
All Sites
Hot Questions
Top Users
Newsletters
Blogs
nosatalian
top
accounts
reputation
activity
favorites
subscriptions
Top Questions
77
votes
Simple tool to 'accept theirs' or 'accept mine' on a whole file using git
git
merge
asked May 27 '09 at 10:06
stackoverflow.com
Top Answers
47
How do you merge selective files with git-merge?
stackoverflow.com
Stack Exchange works best with JavaScript enabled
stackoverflow.com
