I am fairly new to git yet currently using it to manage our code in a team environment. I had some rebasing issues and I fixed them using
git checkout --ours filename.txtgit add filename.txtgit rebase --continue
git checkout --ours filename.txt
git add filename.txt
git rebase --continue
Now I wish to push my changes, and so running the following command
$ git push origin feature/my_feature_branch
gives me the following error:
To ssh://[email protected]:7999/repo/myproject.git ! [rejected] feature/my_feature_branch -> feature/my_feature_branch (non-fast-forward)error: failed to push some refs to 'ssh://[email protected]:7999/repo/myproject.git'hint: Updates were rejected because the tip of your current branch is behindhint: its remote counterpart. Merge the remote changes (e.g. 'git pull')hint: before pushing again.hint: See the 'Note about fast-forwards' in 'git push --help' for details.
To ssh://[email protected]:7999/repo/myproject.git
! [rejected] feature/my_feature_branch -> feature/my_feature_branch (non-fast-forward)
error: failed to push some refs to 'ssh://[email protected]:7999/repo/myproject.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
hint: before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
What can I do to get rid of the error?
P.S.: I am avoiding to use the --force option as much as possible.
It seems like, there were new commits being pushed between your last git fetch and git push. In this case, you are required to repeat your steps and rebase my_feature_branch one more time.
git fetchgit rebase feature/my_feature_branchgit push origin feature/my_feature_branch
git rebase feature/my_feature_branch
git push origin feature/my_feature_branch
After the git fetch I recommend examining the situation with gitk --all.
E&ICT MNIT - Data Science and Machine Learning |
IIT Madras - Advance Certification in Data Science and AI |
E&ICT IIT Guwahati - Cloud Computing & DevOps |
E&ICT IIT Guwahati - Cyber Security |
E&ICT IIT Guwahati - Software Engineering & Application Development |
E&ICT IIT Guwahati - Big Data Analytics |
E&ICT IIT Guwahati - Full Stack Web Development |
E&ICT MNIT - AI and Machine Learning |
E&ICT IIT Guwahati - UI UX Design Strategy |
IIT Madras - Data Analytics for Business |
E&ICT IIT Roorkee - Cloud Computing & DevOps |
E&ICT MNIT - Cyber Security & Ethical Hacking |
E&ICT MNIT - Business Analyst & Project Management
Big Data Analytics Courses |
Data Science Courses |
Business Intelligence courses |
Best Salesforce Courses |
Cloud Computing Courses |
Best Digital Marketing Courses |
Programming Courses Online |
Database Certification Courses |
Best Testing Courses |
Project Management Certification Courses |
Best Web Development Certification courses |
Automation Trainings |
Cyber Security Training Courses |
UI UX Course
Data Science Courses |
Best Artificial Certification Intelligence Course |
Machine Learning Training |
Python Course |
DevOps Certification Course |
AWS Training and Certification |
Azure Certification |
AWS DevOps Training |
Azure DevOps Certification Course |
Cyber Security Course |
CEH course |
Big Data Hadoop Certification |
SQL Online Course |
Salesforce Admin Certification |
Online Salesforce Developer Certification |
Selenium Training Online |
Business Analyst Course Online |
Data Analyst Certification course |
Best Microsoft Power BI Certification Course |
Tableau Course Online |
Linux certification Course |
Data Analytics Certification Course |
Digital Marketing Course
MCA Degree Program |
MBA Degree Program |
MBA HR Degree Program |
MBA IT Degree Program |
MBA Finance Degree Program |
MBA General Degree Program |
MSC in Data Science
© COPYRIGHT 2011-2022 INTELLIPAAT.COM. ALL RIGHTS RESERVED.
Download Salary Trends Now !
Learn how professionals like you got up to 100% Salary Hike.