github | Together Java | Page 1

chrome barn Aug 23, 2023, 9:26 AM

#

using git hub for the first time watching a video

#

I get this error

marsh hornetBOT Aug 23, 2023, 9:26 AM

#

<@&987246964494204979> please have a look, thanks.

chrome barn Aug 23, 2023, 9:26 AM

#

marsh hornetBOT Aug 23, 2023, 9:26 AM

#

marsh hornet <@&987246964494204979> please have a look, thanks.

#

While you are waiting for getting help, here are some tips to improve your experience:

Code is much easier to read if posted with syntax highlighting and proper formatting.

If nobody is calling back, that usually means that your question was not well asked and hence nobody feels confident enough answering. Try to use your time to elaborate, provide details, context, more code, examples and maybe some screenshots. With enough info, someone knows the answer for sure.

Don't forget to close your thread using the command </help-thread close:1027500463647621170> when your question has been answered, thanks.

wooden abyss Aug 23, 2023, 9:28 AM

#

since ur not using the command line but click some IDE buttons, please show us exactly what ur doing

#

also post the link to the repo as text please

chrome barn Aug 23, 2023, 9:30 AM

#

#

Im using pull

#

#

wooden abyss Aug 23, 2023, 9:32 AM

#

okay, the link to the repo please

chrome barn Aug 23, 2023, 9:32 AM

#

its private

#

https://github.com/monkeyoohlala/MyChatClient

#

i dont know if you can access that

wooden abyss Aug 23, 2023, 9:32 AM

#

so u want to update ur master branch with a commit u made locally?

chrome barn Aug 23, 2023, 9:32 AM

#

#

I think I did it online

shy drum Aug 23, 2023, 9:33 AM

#

chrome barn

This error usually happens when you create two unrelated repo and try to push one into the other @wooden abyss

wooden abyss Aug 23, 2023, 9:33 AM

#

yes

#

and thats the case here as well

#

ur online repo seems completely unrelated

#

it has a main branch

#

and a readme commit

#

but ur intellij thing is completely different

#

it has a master branch and 2 commits called "commit"

#

@chrome barn what do u want to happen?

#

are u sure this is the right repo?

chrome barn Aug 23, 2023, 9:34 AM

#

I want to store my files on github

wooden abyss Aug 23, 2023, 9:34 AM

#

yeah but ur github repo is at a completely different state

#

do u want to delete whats on github right now and replace it with ur stuff instead?

chrome barn Aug 23, 2023, 9:35 AM

#

yes

#

I dont think there is anything on my github

wooden abyss Aug 23, 2023, 9:35 AM

#

then u have to push

#

not pull

chrome barn Aug 23, 2023, 9:35 AM

#

except the readme file

wooden abyss Aug 23, 2023, 9:35 AM

#

pull is downloading

#

push is uploading

chrome barn Aug 23, 2023, 9:35 AM

#

oh okay

wooden abyss Aug 23, 2023, 9:35 AM

#

and u need to force-push

chrome barn Aug 23, 2023, 9:35 AM

#

I thought it would pull the readme file

wooden abyss Aug 23, 2023, 9:35 AM

#

u just said u want the opposite

chrome barn Aug 23, 2023, 9:35 AM

#

Im watching a video at linked in learning

wooden abyss Aug 23, 2023, 9:35 AM

#

u said u want to delete the readme file and replace it with what u have locally

#

what do u want to do?

chrome barn Aug 23, 2023, 9:36 AM

#

I want to sync it

wooden abyss Aug 23, 2023, 9:36 AM

#

u cant sync two histories that are completely unrelated

chrome barn Aug 23, 2023, 9:36 AM

#

ok let me finish watching the vidfeo

wooden abyss Aug 23, 2023, 9:36 AM

#

also, ur branches are incorrectly named

#

the one on ur github is called main

#

in intellij u called it master

#

i doubt ur video wanted u to do that

chrome barn Aug 23, 2023, 9:37 AM

#

I did not know

#

its an older video

#

how do I undo th at?

#

its a 2021 video

wooden abyss Aug 23, 2023, 9:37 AM

#

id suggest u first push ur code

#

to master

#

not main

#

then u manually copy the readme file into ur intellij and push it as well

#

then u delete the main branch on github

chrome barn Aug 23, 2023, 9:38 AM

#

ay ay captain

wooden abyss Aug 23, 2023, 9:38 AM

#

and go into the settings to tell it to use master as default branch

chrome barn Aug 23, 2023, 9:43 AM

#

I think its because I was following another tutorial and changed the git settings

#

and then I went onto this video

shy drum Aug 23, 2023, 9:44 AM

#

wooden abyss u cant sync two histories that are completely unrelated

You can
You can ask git to basically put your commits on top of the unrelated commits, similarly to a rebase, it's just a flag

chrome barn Aug 23, 2023, 9:44 AM

#

how do I delete the main branch?

#

shy drum Aug 23, 2023, 9:45 AM

#

chrome barn

Do you really want to erase what is in github?

chrome barn Aug 23, 2023, 9:46 AM

#

its my first time using github and I have the code backed up already in a zip file

shy drum Aug 23, 2023, 9:47 AM

#

You can simply do git pull --allow-unrelated-histories
If you want to keep both what is on github and what is in local

chrome barn Aug 23, 2023, 9:47 AM

#

okay

#

historied?

#

or histories

shy drum Aug 23, 2023, 9:48 AM

#

s*

chrome barn Aug 23, 2023, 9:48 AM

#

shy drum Aug 23, 2023, 9:48 AM

#

Ah yes

#

What is your main branch

#

Master ot main ?

chrome barn Aug 23, 2023, 9:49 AM

#

Im not sure

#

shy drum Aug 23, 2023, 9:50 AM

#

git pull --allow-unrelated-histories main

#

Ah

#

Master ?

chrome barn Aug 23, 2023, 9:51 AM

#

I dont remember what I did earlier because I was following a different tutorial

shy drum Aug 23, 2023, 9:51 AM

#

-_'

#

What is the branch where your commits are ?

chrome barn Aug 23, 2023, 9:52 AM

#

is there a way I can delete everything and redo it?

shy drum Aug 23, 2023, 9:52 AM

#

chrome barn is there a way I can delete everything and redo it?

Then delete the project and redo it

#

But there is no need to do thay

chrome barn Aug 23, 2023, 9:52 AM

#

okay

#

#

I think its master

plush quartz Aug 23, 2023, 9:53 AM

#

shy drum What is the branch where your commits are ?

I would guess the master being the one because its the only local

shy drum Aug 23, 2023, 9:54 AM

#

git pull --allow-unrelated-histories master

#

Then try this

chrome barn Aug 23, 2023, 9:56 AM

#

#

should I try main instead?

#

Im looking at the first tutorial I did

#

I used git clone

#

and then git branch --all

#

git branch mybranch

#

git checkout mybranch

#

idk if that matters

shy drum Aug 23, 2023, 10:01 AM

#

Ah my bad

wooden abyss Aug 23, 2023, 10:01 AM

#

i really would not recommend mixing the branches

#

its easier to get rid of main and push master

shy drum Aug 23, 2023, 10:01 AM

#

You need to specify the remote

chrome barn Aug 23, 2023, 10:01 AM

#

but that was for another repo

wooden abyss Aug 23, 2023, 10:01 AM

#

its not a good idea to have master linked to main

shy drum Aug 23, 2023, 10:01 AM

#

Is it ?

#

Wait

wooden abyss Aug 23, 2023, 10:02 AM

#

OPs local branch is master

#

githubs branch is main

#

and they have unrelated histories

shy drum Aug 23, 2023, 10:02 AM

#

Huh

wooden abyss Aug 23, 2023, 10:02 AM

#

whereas main consists of a readme

#

and master of code

shy drum Aug 23, 2023, 10:02 AM

#

Unrelated histories isn't a problem

wooden abyss Aug 23, 2023, 10:02 AM

#

the easiest way is to just copy pasta the readme into master

#

then push master

shy drum Aug 23, 2023, 10:02 AM

#

But different branches yes

wooden abyss Aug 23, 2023, 10:02 AM

#

then tell github to use master as default

#

and then delete main forever

wooden abyss Aug 23, 2023, 10:03 AM

#

yeah, but they are not really worth saving anyways

#

its literally just a single readme file

chrome barn Aug 23, 2023, 10:03 AM

#

the readme file doesnt have anything to do with my code

#

its just a readme file that the tutorial told me to make

wooden abyss Aug 23, 2023, 10:03 AM

#

but u want it. im saying its easier to just copy pasta it

#

instead of trying to tell git to merge the branches together

#

u have to clean up ur branch mess

#

copy pasta the readme file into ur master branch locally
push ur master branch
github settings > set master as default branch
github > delete main branch

#

that takes just a few seconds if u know where to click

#

so stick with me and tell me if ur stuck

chrome barn Aug 23, 2023, 10:06 AM

#

how do I copy and paste the readme file?

wooden abyss Aug 23, 2023, 10:06 AM

#

go to ur github website

#

click the file

#

download it. or click on "raw" and copy the content

#

then create the file in ur intellij

#

this has nothing to do with git-magic

#

its just making a new ordinary file on ur operating system

chrome barn Aug 23, 2023, 10:07 AM

#

wooden abyss Aug 23, 2023, 10:08 AM

#

yes

#

and put the content in there that u want to save

#

cause we will delete main and hence everything in that git repository online

#

so the old readme is gone then

chrome barn Aug 23, 2023, 10:08 AM

#

ok I created the readme file

wooden abyss Aug 23, 2023, 10:08 AM

#

perfect

#

now push

#

if it asks u to which branch, tell it to use master

#

not main

chrome barn Aug 23, 2023, 10:09 AM

#

wooden abyss Aug 23, 2023, 10:09 AM

#

yes

#

push

#

then go to ur github repo into the settings

chrome barn Aug 23, 2023, 10:10 AM

#

wooden abyss Aug 23, 2023, 10:10 AM

#

right on the first page

#

https://i.imgur.com/fMR6L5N.png

Imgur

#

where it says default branch

#

select master

#

instead of main

chrome barn Aug 23, 2023, 10:11 AM

#

wooden abyss Aug 23, 2023, 10:11 AM

#

now click here on the main page: https://i.imgur.com/WduPWeN.png

Imgur

#

ull find a 🚮 icon next to the branches

chrome barn Aug 23, 2023, 10:12 AM

#

delete main?

wooden abyss Aug 23, 2023, 10:12 AM

#

delete main

#

yes

chrome barn Aug 23, 2023, 10:12 AM

#

I see this

#

🙂

wooden abyss Aug 23, 2023, 10:12 AM

#

yes. delete main

chrome barn Aug 23, 2023, 10:13 AM

#

#

there it is

wooden abyss Aug 23, 2023, 10:13 AM

#

if u now go on ur main page of the repo, it should show master and all ur code + readme and everything is fine, right?

#

ah the readme is still missing

#

make a commit and push

#

in intellij

chrome barn Aug 23, 2023, 10:14 AM

#

its in the src folder

wooden abyss Aug 23, 2023, 10:14 AM

#

yeah but u havent uploaded it yet

#

its not on github

#

only in intellij

#

so u have to create a commit and then push that commit

chrome barn Aug 23, 2023, 10:14 AM

#

oh okay its there now

wooden abyss Aug 23, 2023, 10:14 AM

#

👍

chrome barn Aug 23, 2023, 10:14 AM

#

cool thanks

wooden abyss Aug 23, 2023, 10:15 AM

#

now u can try git pull

#

and it should say "everything up to date"

chrome barn Aug 23, 2023, 10:15 AM

#

#

how do I use git to back up my files?

wooden abyss Aug 23, 2023, 10:16 AM

#

what do u mean "backup"?

chrome barn Aug 23, 2023, 10:16 AM

#

like when I am working on my project and I mess up and cant redo the code and I want to get to a previous version of my project

wooden abyss Aug 23, 2023, 10:17 AM

#

u just use git revert

#

or checkout a previous commit

#

all ur code and the full history is on github, online. u cant lose anything anymore

#

not sure how it works in the intellij ui. but i guess u would just click on a commit in the history graph and then right click checkout

#

or right click revert

#

sth like that

chrome barn Aug 23, 2023, 10:18 AM

#

wooden abyss Aug 23, 2023, 10:18 AM

#

nah here:

#

https://i.imgur.com/zL8aU5I.png

Imgur

#

the commit graph

#

u see all commits there

chrome barn Aug 23, 2023, 10:19 AM

#

oh I see

wooden abyss Aug 23, 2023, 10:19 AM

#

so if u want to go back, u just click there

chrome barn Aug 23, 2023, 10:20 AM

#

better delete that it has my email

wooden abyss Aug 23, 2023, 10:20 AM

#

so if u now right click for example the commit 49 minutes ago

#

it should show sth like revert

chrome barn Aug 23, 2023, 10:20 AM

#

if I revert

wooden abyss Aug 23, 2023, 10:20 AM

#

or also "create branch here"

#

lots of options

chrome barn Aug 23, 2023, 10:20 AM

#

can I undo the revert?

wooden abyss Aug 23, 2023, 10:20 AM

#

as long as u dont git push -f (force push), u dont lose anything

chrome barn Aug 23, 2023, 10:21 AM

#

okay

wooden abyss Aug 23, 2023, 10:21 AM

#

if u just want to experiment temporarily, create a new branch

chrome barn Aug 23, 2023, 10:21 AM

#

this is so cool

wooden abyss Aug 23, 2023, 10:21 AM

#

u should get into the habit of master being the final version

chrome barn Aug 23, 2023, 10:21 AM

#

so commit and push creates it in the git hub?

wooden abyss Aug 23, 2023, 10:21 AM

#

commit creates "units of changes" and push then uploads all ur new commits

chrome barn Aug 23, 2023, 10:21 AM

#

and pull gets it from the github?

wooden abyss Aug 23, 2023, 10:21 AM

#

yes, pull downloads all new commits

chrome barn Aug 23, 2023, 10:22 AM

#

yeah my friends were using github and i thought it would be necessary for me to use it as well

#

they were using command line though

wooden abyss Aug 23, 2023, 10:22 AM

#

if ur a programmer, its a must at some point

#

latest in job

#

there is no programmer job that doesnt use git

chrome barn Aug 23, 2023, 10:22 AM

#

well git is not too complicated

wooden abyss Aug 23, 2023, 10:23 AM

#

until u run into complex situations, yeah

chrome barn Aug 23, 2023, 10:23 AM

#

oh

wooden abyss Aug 23, 2023, 10:23 AM

#

wait until u have to resolve ur first merge conflicts 😄

#

but that doesnt happen unless ur working with others on the same project

#

dont worry though. juniors arent really expected to be good at git yet

#

many people learn that as they enter the job

#

barely anyone is good at git before being thrown into actual real projects with other colleagues

chrome barn Aug 23, 2023, 10:25 AM

#

its 3:25 am

#

btw its my birthday in 2 days

wooden abyss Aug 23, 2023, 10:28 AM

#

nice 🎉

chrome barn Aug 23, 2023, 10:28 AM

#

Im turning 41

#

but squid does not believe I am that old

#

well anyway I should get to sleep

#

gn

wooden abyss Aug 23, 2023, 10:31 AM

#

have a good one 👍

chrome barn Aug 23, 2023, 10:02 PM

#

so the main three commands are commit, push, and pull?

shy drum Aug 23, 2023, 10:04 PM

#

chrome barn so the main three commands are commit, push, and pull?

not really, well if that's simpler for you

#github