Re: [cpp-netlib-devel] github

[Dean M. B. <mik...@gm...>]

On Mon, Jan 11, 2010 at 12:32 AM, Jeroen Habraken <vex...@gm...>
wrote:
>
> I've applied a bunch of things from the Fork Queue, and ignored a few
> that failed, which might explain the problem (and would this lead to
> problems in the future, if so, how do I go about fixing it).
>

One way you can do it is by doing a manual rebase of your fork from your
local repository. You will want to look at git-rebase and git-pull manuals
to get that done.

What you want to do first is in your master branch, you get the changes from
the 'upstream' branch. Quoting from Github's documentation on Forking (
http://help.github.com/forking/):

 Pulling in upstream changes
>
> Some time has passed, the upstream repo has changed and you want to update
> your fork before you submit a new patch. There are two ways to do this:
>
>
> $ git fetch upstream master
>
> $ git merge upstream/master
>
>
> $ git pull upstream master
>
> git pull is a more direct way, but the merge it performs can be confusing
> if the user doesn’t expect it and a merge conflict results. git fetch will
> also grab all branches, where git pull will only grab the one specified.
>
> If you have local commits that are not in the upstream branch, a normal
> merge will occur. If your local commits are in the upstream branch, a
> fast-forward merge will be done, moving your local branch to the same commit
> as upstream/master. If both repos have edits to the same location in the
> same file, you may run into a merge conflict. Conflicts must be resolved by
> hand and a commit made to complete the merge.
>
> Now that your local branch has been updated, you can commit, push, and send
> a pull request.
>
> You may wish to do the fetch and merge manually, instead of letting
> git-pull do it for you. This can sometimes help avoid headaches caused by
> mysterious merge conflicts.
>
(Sorry for the HTML email, I just found it might work better for quoting).

HTH

-- 
Dean Michael Berris
cplusplus-soup.com | twitter.com/deanberris
linkedin.com/in/mikhailberis | facebook.com/dean.berris | deanberris.com