[git-users] Git Can't push a link file into remote repo?

2012-09-26 Thread Sean
HI, All: I am a recently setup a git server on mac os ,meanwhile I use a git client on ubuntu to do interaction with this git server. I have a code directory(it's very large ,about 1G ) and I did the following commands to push it to server side: 1. cd ~/test 2. git

Re: [git-users] avoid pulling binaries

2012-09-26 Thread Angelo Borsotti
Hi Konstantin, I have got your suggestion, and done the following: - created a topic branch - forked a develop branch from it - done all the development work, several commits saving all files, sources and binaries - git checkout topic - git merge --squash --no-commit develop

Re: [git-users] avoid pulling binaries

2012-09-26 Thread Konstantin Khomoutov
On Wed, 26 Sep 2012 11:53:08 +0200 Angelo Borsotti angelo.borso...@gmail.com wrote: [...] - created a topic branch - forked a develop branch from it - done all the development work, several commits saving all files, sources and binaries - git checkout topic - git merge

Re: [git-users] avoid pulling binaries

2012-09-26 Thread Angelo Borsotti
Hi Konstantin, the idea of using merge --squash comes from: 1. the need to have a clean history of the changes: the developer that implements something (e.g. a feature or a bugfix) on a topic branch could have done it creating several commits in her/his development branch,

Re: [git-users] Merge and modification strategy

2012-09-26 Thread Konstantin Khomoutov
On Wed, 26 Sep 2012 04:24:39 -0700 (PDT) Salah khamassisa...@gmail.com wrote: [...] I have a little question though: Some team developers that I encountered would like to be able to see which files (codes) are modified in the present time locally. They told me that in their projects, some

[git-users] Re: Merge and modification strategy

2012-09-26 Thread maxhodges
Hi Salah, It sounds like your team might be more familiar with something like Visual SourceSafe. In the VSS model, VSS keeps your code, and one person can check-it-out at a time. VSS discourages multiple users from accessing the same file simultaneously. In Git anyone with access to the

Re: [git-users] Re: Merge and modification strategy

2012-09-26 Thread Gadget/Steve
On 26/09/2012 6:51 PM, Max Hodges wrote: Yes I don't disagree: that notion of locking a file makes no sense in Git. I just wanted to emphasis the importance for teams to stay in communication if they want to reduce any annoying conflicts during merging because of this feature. Just like when

Re: [git-users] Re: Merge and modification strategy

2012-09-26 Thread Max Hodges
Do you have any information of delegates and Git? I haven't come across that feature yet. Could be useful to OP. On Thu, Sep 27, 2012 at 3:20 AM, Gadget/Steve gadgetst...@hotmail.comwrote: On 26/09/2012 6:51 PM, Max Hodges wrote: Yes I don't disagree: that notion of locking a file makes no

Re: [git-users] Re: Merge and modification strategy

2012-09-26 Thread Gadget/Steve
On 26/09/2012 8:14 PM, Max Hodges wrote: Do you have any information of delegates and Git? I haven't come across that feature yet. Could be useful to OP. Take a look at http://git-scm.com/book/en/Distributed-Git-Distributed-Workflows specifically the Dictator - Lieutenant workflow. -- You