|Re: How can I Fast-forward? [message #1078094 is a reply to message #1066057]
||Fri, 02 August 2013 14:34
| Stefan Lay
Registered: July 2009
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.
Powered by FUDForum
. Page generated in 0.02359 seconds