Skip to content

Conversation

@not-nef
Copy link
Member

@not-nef not-nef commented Jan 3, 2022

Screenshot 2022-01-01 160908

@not-nef
Copy link
Member Author

not-nef commented Jan 3, 2022

@im-coder-lg wanna send the readme text?

@im-coder-lg
Copy link
Member

What text?

@im-coder-lg
Copy link
Member

Does a704770 work? Just wanna know!

@not-nef
Copy link
Member Author

not-nef commented Jan 4, 2022

What text?

you said you were gonna write a text for the about page

@not-nef
Copy link
Member Author

not-nef commented Jan 4, 2022

it says there are conflicts. how do i resolve them?

@im-coder-lg
Copy link
Member

I'll manage that as well as help you.

@im-coder-lg
Copy link
Member

im-coder-lg commented Jan 4, 2022

The thing is, @sumeshir26 might've added some code that preexisted here, so it asks which change to accept. I need you to get on to VS Code/Gitpod, open the conflicting files and right beside the changes, a faint "Accept" will be displayed. Choose your change and click that link/button(Electron JS) to change that.

@not-nef
Copy link
Member Author

not-nef commented Jan 4, 2022

What am i supposed to do?
Screenshot 2022-01-04 135342

@not-nef not-nef closed this Jan 4, 2022
@im-coder-lg
Copy link
Member

WHAT HAPPENED? WHERE ARE THE CHANGES? I can fix this, but why'd you close?

@im-coder-lg
Copy link
Member

And why can't I reopen the PR?

@sumeshir26
Copy link
Member

He deleted his branch. Not sure why

@im-coder-lg
Copy link
Member

Merge conflicts? I said I will fix it though... @not-nef are you reopening this?

@not-nef
Copy link
Member Author

not-nef commented Jan 4, 2022

no i will recode it. too many problems

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants