bash script for getting svn behaviour from git on some folder (f.e. containing binaries)
Shell
Switch branches/tags
Nothing to show
Clone or download
Fetching latest commit…
Cannot retrieve the latest commit at this time.
Permalink
Failed to load latest commit information.
README.md
git_acts_like_svn.sh

README.md

to reference of this problem: http://stackoverflow.com/questions/928646/how-do-i-tell-git-to-always-select-my-local-version-for-conflicted-merges-on-a-sp

This script will force some git folder to behave like svn durring merging conflicts. That means when you do git merge or git rebase and conflict accrues, your changes in your branch will overwrite changes you are merging/rebasing from (similar functionality goes to git pull)

  cd ~/myapp/public/xcf/
  sudo ~/path_where_you_cloned_this_repo/git_acts_like_svn.sh