[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Usage of pull rebasing and merges
From:       Thiago Macieira <thiago () kde ! org>
Date:       2011-02-08 8:59:06
Message-ID: 20110208085913.3669873EC () nargothrond ! macieira ! info
[Download RAW message or body]

[Attachment #2 (multipart/signed)]


On Tuesday, 8 de February de 2011 21:20:55 Ben Cooksley wrote:
> Just a word of warning, if you are going to merge two branches
> together, make sure to run "git pull --rebase" before you conduct the
> merge. Once you have conducted the merge, use "git pull" if you
> encounter a non-fast forward error. Do not run "git pull --rebase"
> after performing the merge, under any circumstances

Or throw away your merge, pull again, then merge again.

-- 
Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org
  Senior Product Manager - Nokia, Qt Development Frameworks
      PGP/GPG: 0x6EF45358; fingerprint:
      E067 918B B660 DBD1 105C  966C 33F5 F005 6EF4 5358

["signature.asc" (application/pgp-signature)]

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


[prev in list] [next in list] [prev in thread] [next in thread]