Starting off

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hello everyone

I'm as new as new can be so please be gentle.

git version 1.5.4.5

I'm following the peepcode tutorial peepcode-015-git.mov

I've created a branch, and now we're trying to use rebase to 'watch' the master branch from the new branch.

When I run the rebase command from the other branch I get these types of warnings/errors

j235-md:gcal mjdavies$ git rebase master
First, rewinding head to replay your work on top of it...
HEAD is now at 8b18ef3... Assing test line to master branch
Applying adding the cas stuff from Kevs app
.dotest/patch:52: trailing whitespace.

.dotest/patch:120: trailing whitespace.
  reused by the Rails filter in subsequent requests (see the note below
.dotest/patch:121: trailing whitespace.
  in the 2.0.1 release). From the user's and integrator's point of view
.dotest/patch:123: trailing whitespace.
* Redirection loop interception: The client now logs a warning message when it
.dotest/patch:124: trailing whitespace.
believes that it is stuck in a redirection loop with the CAS server. If more
warning: squelched 226 whitespace errors
warning: 231 lines add whitespace errors.
Applying adding the before filter to the application.rb, otherwise it knoweth not what to do

Can someone explain to me what's happening here and if I should be worried about it?

If I should be worried about it, can anyone point me in the direction of some documentation of a good (easy)way to remove the whitespace?

Thanks everyone.

PS, I do check the archives and found this from yesterday

http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=81336

Does that mean that if I update my git this problem will be resolved? Sorry for being so naive, I wont be for long (hopefully)

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux