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 i
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 i
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 (this
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Hi All,
We have a large project with several sub-projects all SVN with several
thousand commits, branches, tags, etc., and to allow the development of
the sub-projects to proceed with different teams our main project
references them as externs at fi
On Wed, 26 Sep 2012 11:53:08 +0200
Angelo Borsotti 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 --squash --no-commit devel
I am doing a research on continuous integration process. I am reading some
topics from the book available online and understood the Clone-Commit-Fetch
-Push process.
I have a little question though: Some team developers that I encountered
would like to be able to see which files (codes) are modif
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, commit
On Wed, 26 Sep 2012 04:24:39 -0700 (PDT)
Salah 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 codes have to
> be mod
Hi Salah,
It sounds like your team might be more familiar with something line Visual
SourceSafe. In the VSS model, VSS holds keep your code and one person can
check it out at a time. The VSS discourages multiple uses from accessing
the same file simultaneously.
In Git anyone with access to th
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 repos
On Wed, 26 Sep 2012 08:33:43 -0700 (PDT)
maxhodges wrote:
[...]
> The problem you are probably worried about if when two users make
> changes to the exact same code; that is, when two developers edit the
> same lines of code in the same source file. It's still possible to
> merge the files, but G
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 you're renovating a house, a little
communicati
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 y
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 wrote:
> 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
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 re
15 matches
Mail list logo
