Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added proper structuring of files inside lib #54

Merged
merged 6 commits into from Mar 29, 2021

Conversation

Borahb
Copy link
Contributor

@Borahb Borahb commented Mar 25, 2021

Description :

Done proper structuring of files inside lib folder.
@pratyushmp
Screenshot (464)

Fixes : #53

Have you read the Contributing Guidelines on Pull Requests?

  • Yes
  • No

Type of change :

Please delete/edit options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist :

  • My code follows the style guidelines(Clean Code) of this project
  • I have performed a self-review of my own code
  • My changes generate no new warnings
  • I have added tests/screenshots(if any) that prove my fix is effective or that my feature works.

@pratyushmp
Copy link
Owner

@Borahb There is a merge conflict, please resolve it.

@Borahb
Copy link
Contributor Author

Borahb commented Mar 26, 2021

@pratyushmp It is working fine in my system. It shows no issues.

@SapinderSingh
Copy link
Contributor

@pratyushmp It is working fine in my system. It shows no issues.

Merge conflicts can not be on your system. The branch is having merge conflicts. You have to pull the new code, merge it in your branch and then push.

@Borahb
Copy link
Contributor Author

Borahb commented Mar 27, 2021

@pratyushmp I have updated my changes in this commit.
Screenshot (465)

@infiniteoverflow
Copy link
Collaborator

@Borahb Your branch is 8 commits behind the main branch , kindly even it...it will reduce the merge conflicts

@Borahb
Copy link
Contributor Author

Borahb commented Mar 28, 2021

@infiniteoverflow How do I even my branch with the main branch.

@pratyushmp
Copy link
Owner

pratyushmp commented Mar 28, 2021

@Borahb Enter the following commands in the terminal:-

git remote add upstream 'https://github.com/pratyushmp/Batua'

git fetch upstream

git pull upstream main

git push origin <your-branch-name>

@Borahb
Copy link
Contributor Author

Borahb commented Mar 29, 2021

@pratyushmp I have resolved the conflicts. Thank you

@pratyushmp
Copy link
Owner

Good Job @Borahb !

@pratyushmp pratyushmp merged commit 8ce0141 into pratyushmp:main Mar 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

No structuring of files inside lib folder
4 participants