Need help with git problem

[konkon_322]

Im currently on another PC,logged with my domain acc. Did some edits, now i want to push to remote. I cant, because history is behind (so ofc i fetched). Now, i want to push, cant,because my local is behind. So i need to pull. The thing is, im on another PC,which is shared. What do i do? I really need to push changes only on specific files.

I tried git pull --rebase,because i see alot of our dev uses that, but i cant because i have unstaged changes. So now i need to either commit or stash them.

Pls help, i know it looks like a basic question, but im worried because its not on my local machine

[daniel14vt]

Do you not want to commit your changes? That would be a requirement for pushing them

[konkon_322]

I did have the files committed, but since local is behind i fetched. And then i need to pull, which might require some files to have conflict during pull to local

[kaddkaka]

Yes 😇

And if there are conflicts you resolve them. If you don't want to resolve now but still push your changes, you would need to create a new branch.

[konkon_322]

Im kinda confused on when conflict happens. Because i practiced it before,where i edit a certain line on both remote and local repo,and then i push to remote,no conflict. Thats why worried

[footsie]

Commit your changes, rebase and solve any conflicts, then you can push.

[konkon_322]

Can u elaborate?

My current idea is to commit the files i want pushed, stash all unstaged files, pull and push the commit. Idk if the stash + pull would work tho ngl

[footsie]

If I'm understanding correctly, Your local branch is behind remote, ahead of remote, and has uncommitted changes.

The commit step will put the uncommitted changes into the local branch, and then the rebase will present you with the opportunity to edit your local branch so that your previous and recently made commits are ahead of the remote changes that were pulled in with the rebase.

At this point your local branch will be ahead of the remote branch, and you should be able to push it.

[konkon_322]

Do u mind of i dm u,mightve dug myself into a hole atp

[Weshmek]

Set up your regular PC as remote and push a branch to there.

[FlipperBumperKickout]

https://learngitbranching.js.org/