I have changed the git ignore file to ignore *.suo

however I had a *.suo file which will not merge from one branch to another because it is binary.


So i deleted it from the "merge to" branch thinking this would allow me to merge and it would just be added
rather than a binary merge being atempoted.

However now I have
LOCAL: delete
REMOTE:
Binary files a/:l:.......  .suo and b/:3......    .suo differ

how do I get the merge to work.
I am not interested in su files any more in any way re git
hence putting *.suo in gitignore file


The rest of the merge will not go because of this.  How do I resolve this?

-------------------------------------------------
This message sent via VFEmail.net
http://www.vfemail.net
$14.95 Lifetime accounts! 15GB disk! Commercial Mail Options! No bandwidth quotas!


--
You received this message because you are subscribed to the Google Groups "Git for 
human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to