[git-users] Re: Install git on Linux Server

2015-02-07 Thread rupert THURNER
On Friday, December 5, 2014 at 4:42:34 AM UTC+1, Rick Umali wrote: > > Hello Alexander, > > On Thursday, December 4, 2014, you wrote: >> >> So, I wonder if there is any way of installing git in my Linux server and >> don't have any sort of interaction with www.github.com? >> >> My ideal is to hav

[git-users] Can I make `git merge` always conflict on file changes?

2015-02-07 Thread Barry Moore
Hey All, I posted this on stack overflow (see http://stackoverflow.com/questions/28377725/can-i-make-git-merge-always-conflict-on-file-changes), but I thought it would be relevant to ask here too. I copy and paste underneath: I am hoping I have a simple question for you, but I can't find an