Thank you Peter and Volker for all the help! I actually forgot about this one until I had to look this up again!
-KnS On Thu, Apr 10, 2014 at 6:51 PM, Peter Bruin <[email protected]> wrote: > Hello, > > I'm also a git beginner, so the experts should correct me if there is a > better way, but what I normally do in such situations is > > $ git stash > > $ git pull git://trac.sagemath.org/sage.git develop > $ git stash pop > > Since you say your change is just one line, this is probably the > least-effort solution. For larger changes (e.g. working on Trac tickets), > it would probably be better to create a new branch forking off the > development branch: > > $ git checkout -b mybranch develop > ... make changes and commit them in your branch ... > > When you want to update to the last development branch, > > $ git checkout develop > > $ git pull git://trac.sagemath.org/sage.git develop > > To go back to your branch, > > $ git checkout mybranch > > and then, if your branch starts to conflict with develop, resolve the > conflicts using > > $ git merge develop > > Peter > > > Op donderdag 10 april 2014 14:02:05 UTC+1 schreef KnS: > >> I am now trying to update SAGE to its newest development version via GIT: >> >> Apples-MacBook-Pro:sage apple$ git pull >> git://trac.sagemath.org/sage.gitdevelop >> >> remote: Counting objects: 14241, done. >> >> remote: Compressing objects: 100% (5832/5832), done. >> >> remote: Total 12263 (delta 10270), reused 8154 (delta 6337) >> >> Receiving objects: 100% (12263/12263), 3.06 MiB | 7.00 KiB/s, done. >> >> Resolving deltas: 100% (10270/10270), completed with 1102 local objects. >> >> From git://trac.sagemath.org/sage >> >> * branch develop -> FETCH_HEAD >> >> Updating 8be52e6..37c8a8c >> >> error: Your local changes to the following files would be overwritten by >> merge: >> >> build/pkgs/singular/spkg-install >> >> Please, commit your changes or stash them before you can merge. >> >> Aborting >> >> So, the problem is that I have a line commented out from that file to get >> 6.1.1 to build. So, how do I proceed now? Do I commit this change to my >> local repository or not? Also, in any case, I would like to have the >> changes I made to GAP packages folder remain on my local repository. >> >> Something in me tells that I should ideally be creating a new branch or >> sth. Being a newbie that I am, I would be glad if somebody told me what is >> the best way forward. >> >> With Sincere Regards, >> Kannappan. >> > -- > You received this message because you are subscribed to the Google Groups > "sage-support" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > Visit this group at http://groups.google.com/group/sage-support. > For more options, visit https://groups.google.com/d/optout. > -- You received this message because you are subscribed to the Google Groups "sage-support" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/sage-support. For more options, visit https://groups.google.com/d/optout.
