[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Update a fork for DLA publishing



Hi

Thank you. I have added this information (with some rephrasing) to the wiki.

I use the term rebase to update a branch from something else. I
realize that this is not the git term. From your answer I realize that
I have looked for the wrong solution. I have looked on how to update
the master branch in my fork, while the solution is to branch off from
a different branch instead.

Best regards

// Ola

On Tue, 30 Jun 2020 at 12:30, Bastian Blank <waldi@debian.org> wrote:
>
> On Tue, Jun 30, 2020 at 12:03:47PM +0200, Ola Lundqvist wrote:
> > Does anyone know how to rebase the fork? Or is my way the way to do it?
>
> git remote add upstream $url (once)
> git fetch upstream
> git checkout -b new-branch upstream/master
> git push --set-upstream origin new-branch
>
> > Not to rebase is not the best option, since the webmasters asked me to
> > rebase last time.
>
> No idea what you mean with "rebase"?  You base your MR off new branches
> each time.
>
> Bastian
>
> --
> Pain is a thing of the mind.  The mind can be controlled.
>                 -- Spock, "Operation -- Annihilate!" stardate 3287.2
>


-- 
 --- Inguza Technology AB --- MSc in Information Technology ----
|  ola@inguza.com                    opal@debian.org            |
|  http://inguza.com/                Mobile: +46 (0)70-332 1551 |
 ---------------------------------------------------------------


Reply to: