Pushing to remote fails because "tip of your current branch is behind its remote counterpart"
Snowybluesky
My friend is trying to help me learn to resolve conflicts in pull requests. He created a repository. I cloned it, and created a branch called "EditReadMe2". I pushed "EditReadMe2" to the repository, and he created a conflict.
I did
git checkout master
git pull
git checkout EditReadMe2
git rebase master
It warned me of a conflict which I resolved, but when I tried pushing EditReadMe2 it gave me the error.
I entered in the commands again to show my terminal in the attached image, because I don't know how its possible for the branch to be behind when I pull and rebase a second time, and it tells me everything is up to date, but then it still fails.
Force pushing solved the problem, but I want to know how to do this without using --force.
Thanks!
Yusef Maali
The command sequence is incomplete.
After git checkout EditReadMe2 you need to perform another git pull.
git pull updates the working index of the current branch, not of all local branches you have.
When you issue the rebase command, you are rebasing an updated master into your "old" EditReadMe2 branch.
Anyway the git rebase is fine to be used in such way.
An hint:
if you are switching to master, git pulling, switching back to EditReadMe2 only for the purpouse of rebasing, you can use the following sequence and save a couple of commands:
Assuming you are in EditReadMe2
git pull
git rebase origin/master
Collected from the Internet
Please contact [email protected] to delete if infringement.
edited at
Related
TOP Ranking
- 1
Loopback Error: connect ECONNREFUSED 127.0.0.1:3306 (MAMP)
- 2
Can't pre-populate phone number and message body in SMS link on iPhones when SMS app is not running in the background
- 3
pump.io port in URL
- 4
How to import an asset in swift using Bundle.main.path() in a react-native native module
- 5
Failed to listen on localhost:8000 (reason: Cannot assign requested address)
- 6
Spring Boot JPA PostgreSQL Web App - Internal Authentication Error
- 7
Emulator wrong screen resolution in Android Studio 1.3
- 8
3D Touch Peek Swipe Like Mail
- 9
Double spacing in rmarkdown pdf
- 10
Svchost high CPU from Microsoft.BingWeather app errors
- 11
How to how increase/decrease compared to adjacent cell
- 12
Using Response.Redirect with Friendly URLS in ASP.NET
- 13
java.lang.NullPointerException: Cannot read the array length because "<local3>" is null
- 14
BigQuery - concatenate ignoring NULL
- 15
How to fix "pickle_module.load(f, **pickle_load_args) _pickle.UnpicklingError: invalid load key, '<'" using YOLOv3?
- 16
ngClass error (Can't bind ngClass since it isn't a known property of div) in Angular 11.0.3
- 17
Can a 32-bit antivirus program protect you from 64-bit threats
- 18
Make a B+ Tree concurrent thread safe
- 19
Bootstrap 5 Static Modal Still Closes when I Click Outside
- 20
Vector input in shiny R and then use it
- 21
Assembly definition can't resolve namespaces from external packages
Comments