[ET Trac] [Einstein Toolkit] #138: GetComponents should use "git pull --rebase" for updating

Einstein Toolkit trac-noreply at einsteintoolkit.org
Wed Dec 8 12:21:52 CST 2010

#138: GetComponents should use "git pull --rebase" for updating
  Reporter:  eschnett       |       Owner:  ian.hinder@…         
      Type:  defect         |      Status:  new                  
  Priority:  major          |   Milestone:                       
 Component:  GetComponents  |     Version:                       
Resolution:                 |    Keywords:                       

Comment (by hinder):

 This happens if you have local changes (committed or uncommitted) in your
 repository directory.  If we say that we want to support this
 automatically, then we should also do the same for SVN.  When doing an
 update, if conflicts are found the user should be warned about this.  The
 commands Erik listed are the correct thing to do, but beware that they
 will not automatically all work.  The git pull --rebase can fail if there
 are local commits conflicting with remote commits, and the git stash apply
 can fail if the working copy conflicts with remote commits.  Detecting
 these failures and doing something sensible to warn the user would be
 important to avoid confusion.  This is a generalisation of the same
 problem that happens with SVN when the working copy conflicts with remote

Ticket URL: <https://trac.einsteintoolkit.org/ticket/138#comment:1>
Einstein Toolkit <http://einsteintoolkit.org>
The Einstein Toolkit

More information about the Trac mailing list