Tor, the guy who advised you doesn't really know what he's talking
about.
Git automatically runs gc every so often, and either way, git gc can
only do two things:
1) Make some disk space available,
2) Speed up git's operation.
It doesn't change git's operation AT ALL.
He might have meant: run '
Peter,
I'm not really sure (only a few mins ahead of you
github-experience-wise), but it seems like you cannot push to a parent
branch if you don't have the right permissions to their repo. So, in
that case, you have to tell the owner that you'd like him to look at and
incorporate your ch
Hi,
I'm a fan git and I think some of the complaints being given here are
a bit unfair.
I think part of them problem was the way github was used. When there
are only 4-5 developers working on a single project in the same room I
would strongly recommend using a single central repository and giving
On Apr 8, 8:36 am, "staa...@gmail.com" wrote:
> # git clone git://github.com/peterpilgrim/ZenWriterFX.git
> # git remote add dickwall git://github.com/dickwall/ZenWriterFX
> # git fetch dickwall
> # git merge dickwall/master
> # git remote add mattgrommes git://github.com/mattgrommes/ZenWriterFX.g
Thanks for looking into this.
I don't think the root problem we were running into had to do with
CRLF because at least in one case the merge conflict happened between
Dick's changes and mine -- and Dick and I were using Linux and OSX
(guess who used what), which both correctly use \n as the line
t
On 8 Apr, 11:51, Erlend Hamnaberg wrote:
> http://help.github.com/dealing-with-lineendings/
>
> On Thu, Apr 8, 2010 at 12:37 PM, Peter A Pilgrim
> wrote:
>
Thanks Erlend
I followed the help page on the github website. I hope it works going
forward.
I had to "git add" manually my files and fol
I believe setting the 'core.autocrlf' configuration property will
help. See http://www.kernel.org/pub/software/scm/git/docs/git-config.html
Luis
On 2010/04/08, at 11:37, Peter A Pilgrim wrote:
On 8 Apr, 01:36, Chris Phelps wrote:
Hi
There was one issue during merging that I have never r
http://help.github.com/dealing-with-lineendings/
On Thu, Apr 8, 2010 at 12:37 PM, Peter A Pilgrim wrote:
>
>
> On 8 Apr, 01:36, Chris Phelps wrote:
>
> Hi
>
> There was one issue during merging that I have never resolved.
>
> Dick attempted to merge my changes back at the round up on the day,
>
On 8 Apr, 01:36, Chris Phelps wrote:
Hi
There was one issue during merging that I have never resolved.
Dick attempted to merge my changes back at the round up on the day,
however my files were wholly incompatible because the diffs where
linefeed changes.
How do we solve this CR <=> LF / CR p
On 8 Apr, 01:36, Chris Phelps wrote:
> Peter,
>
> If you view your fork on the github site, you can click "Pull
> Request" at the top of the screen. This will let you send to any of the
> other forks, then they can do a "git pull" from their client to merge
> your changes into their branch.
I just played around a bit with Peter, Dick and Matts repositories.
* Clone from peter:
# git clone git://github.com/peterpilgrim/ZenWriterFX.git
* Merge in changes from Dick
# git remote add dickwall git://github.com/dickwall/ZenWriterFX
# git fetch dickwall
# git merge dickwall/master
I could
I was there :)
And -none- of my complaints are about github. Github seemed to work
well -- we created accounts, created repositories, shared those
repositories, etc. etc. Worked smoothly.
What didn't work smoothly was git itself. We did some very trivial
things, and not only did we get merge conf
Peter,
If you view your fork on the github site, you can click "Pull
Request" at the top of the screen. This will let you send to any of the
other forks, then they can do a "git pull" from their client to merge
your changes into their branch. (The only thing that makes any branch
more aut
On Apr 6, 9:48 pm, Chris Phelps wrote:
> I'm sure others will pipe up, but one of the biggest problems we had,
> apart from the basics of people learning how to use the tool, was some
> nasty merge problems. A couple participants ran into merge problems
> which seemed to be caused by cross-plat
I don't think there was anything wrong with git or github. We just
didn't know what we were doing. (I tried to help, but I'm afraid I
made it worse.)
One thing that I found that I thought github could have done a bit
better was that they could have put more documentation up on what to
do when yo
Ah - my bad. I was contacted by one of the engineers working on
GitHub (http://twitter.com/mojombo) about my rantings about it - and I
said I would post a message here asking folks to please explain what
specifically was not working as expected.
Please folks, if you were at the Roundup and you ha
Regarding the Git integration in Eclipse, you can expect this to
improve pretty quickly. Git is the future of Eclipse; both Google and
SAP fund full-time developers to work on the tooling, and some Eclipse
projects have moved to Git already, with more to follow.
Regards, Neil
On Apr 6, 5:56 pm, J
17 matches
Mail list logo
