Home/ Questions/Q 7079375
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-28T06:39:53+00:00

$ git branch master * portal $ git fetch $ git merge origin/portal Already

  • 0
$ git branch
  master
* portal
$ git fetch
$ git merge origin/portal
Already up-to-date.
$ git pull
Already up-to-date.
$ git push
To git@github.com:ripper234/Commerce-Sciences.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:ripper234/Commerce-Sciences.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.

Normally I would do a gitk -all to try and see what the hell is going on, but this is on a linux box without a graphical shell.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Note this line from the error message:

    ! [rejected]        master -> master (non-fast-forward)

    You merged the portal branches, but you’re also trying to push master, since git push will by default try to push all branches which also exist on origin. Try this:

    $ git push origin portal
    • 0