GitHub integration is asking me to push and pull at the same time

[JonahKC]

Bug description:
GitHub integration is asking me to push and pull at the same time

Expected vs Current Behavior:
I should be able to either pull or push

Steps to reproduce:
Have a repl synched to a GitHub repo, edit both the repl and GitHub repo.

Bug appears at this link: https://replit.com/@CallumCM/LynxFeed

Screenshot(s)/Screen Recording:

Browser/OS/Device: Mozilla/5.0 (iPhone; CPU iPhone OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Mobile/15E148 Safari/604.1

Replit Profile: https://replit.com/@JonahKC

[TaokyleYT]

You should commit your changes first, if I memorise it correctly

[Firepup650]

According to the screenshot, they must pull changes before they can push their changes. But they must push their changes before they can pull their changes.

[Firepup650]

On that note, closer inspection of the image reveals that’s not quite what it’s saying here. See if you have a Commit button you can press further down on the UI (you might have to provide a commit message), and see if it will let you pull after you “locally” commit the changes.

[Darkoknight]

this has to be a solve.

[JonahKC]

I’m very confused, it’s still not letting me push or pull. Thanks for your help though

[Firepup650]

See if you can provide a commit message, and then Stage and commit all changes

[JonahKC]

Yes, I did that, where it says “Testing pls?” But below it says “Cannot push due to unpulled changes” and vice versa

[Firepup650]

Try opening the Shell and running these commands:

git add .
git commit -m <some commit message>  -a
git pull origin main
git push -u origin main

This should:

1. Add any new files to GIT
2. Commit any changes replit missed
3. Pull from github
4. Push to github

(Added git add . from Quantum’s suggestion)

[QuantumCodes]

Its better to do first git add . so that newly created files are also commited

[JonahKC]

Sorry if I’m just majorly missing something-- but what should I do? It seems like it’s not letting me pull because the replit cache file updates itself after I push.

[Firepup650]

See if there’s already a .gitignore file, if there’s not, make one. Then try:

git rm -r --cached .cache

and add .cache/** to the .gitignore file.

Also, I don’t believe this is your fault, it’s just replit having a weird quirk ¯\_(ツ)_/¯

[JonahKC]

mkay so i made a .gitignore, and it looked like it was going to let me push

But of course replit doesn’t want that to happen lol:

[Firepup650]

Try using the commands I originally posted to pull/push from Shell:

@Firepup650

git add .
git commit -m <some commit message>  -a
git pull origin main
git push -u origin main

[JonahKC]

That worked! Thank you so much :))

The __replit_disk_meta.json file is still saying it should be pushed, but I’ll ignore that for now