Life Long Learner

Founder Fellow, part of ODF10!

I encountered an issue while pushing my code from local repository to its remote version today. 

Here's what I learnt:

THIS WAS THE ERROR

To repository
 ! [rejected]  local-repo -> remote-repo (non-fast-forward) 

error: failed to push some refs to 'https://github.com/Marrockx/zc_plugin_channels.git' 

hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. 

Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. 

hint: See the 'Note about fast-forwards' in 'git push --help' for details.

HOW I SOLVED IT

I found  an helpful article from GitHub docs from my Google search which can be viewed below: 

First Solution

$ git pull origin YOUR_BRANCH_NAME
# Grabs online updates and merges them with your local work

Second Solution 

git merge branch_name
git checkout branch_name
git merge --no-ff feature_branch
git push -u origin branch_name

You can see other solutions as well

https://docs.github.com/en/get-started/using-git/dealing-with-non-fast-forward-errors

I hope you find it useful.

Excited to start a new #WorkingOutLoud circle with #Frauenstärken #gemeinsamwachsen.

Decided to continue my deep dive into the wonderful and complex world of healthcare by applying for On Deck Health fellowship. And I got in!

https://twitter.com/astalagriotte/status/1438239286843875337?s=21

On Deck Catalyst #ODC1 officially started! So excited to meet wonderful people coming from all walks of life with a deep passion for tech 

https://plusacumen.novoed.com/#!/courses/adaptive-leadership-2021-1/statements/832880