{"thread":{"id":"18795","subject":"Egit: how to merge after fetch (or pull)","startedAt":"2009-04-08T21:56:23Z","lastAt":"2009-04-09T03:39:47Z","messageCount":2,"participants":["John Bito","Robin Rosenberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"110876","messageId":"3ae83b000904081456i37ad65ate133469fa9a8f23c@mail.gmail.com","threadId":"18795","inReplyTo":null,"subject":"Egit: how to merge after fetch (or pull)","fromName":"John Bito","fromEmail":"jwbito@gmail.com","sentAt":"2009-04-08T21:56:23Z","receivedAt":"2009-04-08T21:56:23Z","isPatch":false,"sender":{"key":"jwbito@gmail.com","avatar":"https://gravatar.com/avatar/e94274c6b71a11e3fa03d91e75937609e66315f23267efd591ef1f98bb860bf9?d=mp&s=160"},"body":"I'd like to pull a branch before I do more work on it.  After fetch,\ngit status says the branch is behind origin by N commits.\n\nCan you tell me if there is an operation I can do via egit to get the\norigin changes onto my branch? (Most of the documentation I found for\nEgit appears to be before the fetch command was implemented.)\n\nIn the mean time, I've been using 'git pull'. Unfortunately, I found\nthat it's important to shut down Eclipse while doing a git operation\nusing Cygwin - a GC run when Egit had a file open caused a problem in\nthe repository that subsequent pushes propagated to my GitHub\nrepository.  It would be nice to work entirely within Eclipse.\n\nThanks!\nJohn\n"},{"id":"110888","messageId":"200904090539.47489.robin.rosenberg.lists@dewire.com","threadId":"18795","inReplyTo":"3ae83b000904081456i37ad65ate133469fa9a8f23c@mail.gmail.com","subject":"Re: Egit: how to merge after fetch (or pull)","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-04-09T03:39:47Z","receivedAt":"2009-04-09T03:39:47Z","isPatch":false,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"onsdag 08 april 2009 23:56:23 skrev John Bito <jwbito@gmail.com>:\n> I'd like to pull a branch before I do more work on it.  After fetch,\n> git status says the branch is behind origin by N commits.\n> \n> Can you tell me if there is an operation I can do via egit to get the\n> origin changes onto my branch? (Most of the documentation I found for\n> Egit appears to be before the fetch command was implemented.)\n> \n> In the mean time, I've been using 'git pull'. Unfortunately, I found\n> that it's important to shut down Eclipse while doing a git operation\n> using Cygwin - a GC run when Egit had a file open caused a problem in\n> the repository that subsequent pushes propagated to my GitHub\n> repository.  It would be nice to work entirely within Eclipse.\n\nA very recent update to msysgit (not git core and hence not cygwin) might help there. \nWindows locks files when reading and the Eclipse plugin reads things from the\nrepo when changes are detected to see if anything interesting is there. The fix\nin msysgit retries certain operations a number of times if they fail with access denied,\nwhich is what you get if the file is open for reading.\n\nBuilt-in pull is not there just yet.\n\n-- robin\n"}]}