Eclipse Community Forums - RDF feed
https://www.eclipse.org/forums/
Eclipse Community ForumsHow can I Fast-forward?
https://www.eclipse.org/forums/index.php/mv/msg/489704/1066057/#msg_1066057
I've just done a Pull of code from GitHub of all the changes I've done on my other computer. The project now has a down-arrow and an 8 next to it, which I assume means that there are 8 commits in the repository ahead of the current state of my "head".
How do I tell it to fast-forward and move master and HEAD to the most-recent commit (which is origin/master and FETCH_HEAD)?
This seems like fairly obvious functionality - to pick up the latest version of the code from the remote repository, but I'm darned if I can work out what I'm supposed to do.
What am I missing?
Thanks!]]>Andrew Ducker2013-06-29T15:08:51-00:00Re: How can I Fast-forward?
https://www.eclipse.org/forums/index.php/mv/msg/489704/1066356/#msg_1066356
Note that your use of the term "fast forward" might indicate some confusion. Do you actually mean "update my local clone and working copy"?? This might be done by a fast-forward, or it might require a merge. A fast-forward is a very specific type of update. it is not a general term for "update to the latest".
]]>Matthew Webber2013-07-02T10:07:25-00:00Re: How can I Fast-forward?
https://www.eclipse.org/forums/index.php/mv/msg/489704/1078094/#msg_1078094
just select the most-recent commit (which is origin/master and FETCH_HEAD) in the history view and then "Merge" in the context menu.
Or select origin/master in the Git repositories View and then also Merge.
Normally, when you pull, the merge should have been done also (or a rebase, if this is configured the local branch). How did you create the local branch?
Fast Forward is a special case of Merge when the the current HEAD is already in the history of the commit you want to merge into.