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

Review 2 Markdown preparation #19

Open
bholebaba0135 opened this issue Mar 24, 2023 · 38 comments
Open

Review 2 Markdown preparation #19

bholebaba0135 opened this issue Mar 24, 2023 · 38 comments

Comments

@bholebaba0135
Copy link
Owner

No description provided.

@bholebaba0135
Copy link
Owner Author

Guys, we'll be adding content for the review 2 to the Readme.md that already exists in this repository. No need to create a separate Markdown

@bholebaba0135
Copy link
Owner Author

  1. Make sure all commits are made to the beta branch. Will push everything to the main branch at the time of submission.
  2. Download Obsidian if you haven't installed it yet as well as Zotero. Install both the chrome extension as well as the PC software.
  3. Lets have a meet this evening. I am informing the same on WhatsApp group. However all communication henceforth would be via issues as it is part of the rubrics for review 2

@bholebaba0135
Copy link
Owner Author

3 important things to note to make sure that the process of collaboration is smooth sailing:

  1. Everyday commit and push your work to the beta in the self chosen time interval which has already been decided.
  2. Run a git pull command everytime you start working on the markdown in your local obsidian vault. This is to make sure that you are always working in sync with latest version of the beta branch
  3. Workflow has been added. Kindly check the Readme.md. There's a backlink in the Roles and Responsibilities section. Comment here for any doubts

@harshitub2
Copy link
Collaborator

Downloaded Obsidian and zotero

@prakhargoyal3043
Copy link
Collaborator

if someone had pushed the changes in beta and then those have been pushed in main, then we need to pull those again or it will get updated automatically in our local git?

@harshitub2
Copy link
Collaborator

Have added the literature survey table format, will soon work on the papers.

@bholebaba0135
Copy link
Owner Author

@prakhargoyal3043 if you are creating a branch from main then all the commits in the main at the point of the creation of branch would also be copied in branch but later any changes in main wont reflect in other branches. It would show that main is x commits ahead of your branch.

@bholebaba0135
Copy link
Owner Author

For now just ignore if you receive such notifications. I'll push the content from every contributor's branch before going for review 2

@bholebaba0135
Copy link
Owner Author

Also by local git if you meant the local repository on your PC then make sure of 2 things:

  1. You should always be present on your own branch and not on any other branch. To navigate to your own branch enter command 'git checkout Prakhar'
  2. It is generaly advised to run a 'git pull' command each time you git bash since many people are collaborating but since you are the only one commiting to your branch from your local repo, its not necessary.

@harshitub2
Copy link
Collaborator

8e0a7070-f84a-47c1-a04b-29205074da1b
I am getting this error when i am trying to push.

@harshitub2
Copy link
Collaborator

Uploading 8e0a7070-f84a-47c1-a04b-29205074da1b.jpg…

@bholebaba0135
Copy link
Owner Author

@harshitub2 This error indicates that ur local version of the repo is not updated to the latest changes in our remote repo on github. Git gives this error to prevent overwriting of one collaborator's changes by another collaborator.

To resolve this, just make sure you enter the command 'git pull' everytime you start working. After that you can add your changes, commit them and push to the remote repo.

@prakhargoyal3043
Copy link
Collaborator

I have added the research papers and pushed those.

@harshitub2
Copy link
Collaborator

Added the research papers and pushed them.

@Vivekrathore2002
Copy link
Collaborator

Literature Survey is done guys

@Vivekrathore2002
Copy link
Collaborator

We have to change little bit more for more perfection.

@asrathore257
Copy link
Collaborator

all the literature surveys added and pushed in my branch

@Vivekrathore2002
Copy link
Collaborator

all the literature surveys added and pushed in my branch

What about the Methodologies

@pranjal6314
Copy link
Collaborator

Literature Survey is done

@pranjal6314
Copy link
Collaborator

Methodologies done

@Vivekrathore2002
Copy link
Collaborator

i Also completed the survey part,Any updates on methodologies?

@pranjal6314
Copy link
Collaborator

I'm trying to push my code to the GitHub repo, but it showing that my git push is rejected. why?
image

@asrathore257
Copy link
Collaborator

write down all the methodologies after the survey part and push it.

@bholebaba0135
Copy link
Owner Author

all the literature surveys added and pushed in my branch

What about the Methodologies

@Vivekrathore2002 You can push them to your branch. I will merge it into main after reviewing
Make sure you run the git pull command first in your git bash
Then, Add the Methodologies section below Literature Surveys in the following format

Methodologies

  1. Paper title:
    (Methodology content)
    then git add, commit and push

@Vivekrathore2002
Copy link
Collaborator

okay

@asrathore257
Copy link
Collaborator

asrathore257 commented Mar 31, 2023

@pranjal6314 once check

I'm trying to push my code to the GitHub repo, but it showing that my git push is rejected. why? image

once try again with correct folder

@bholebaba0135
Copy link
Owner Author

I'm trying to push my code to the GitHub repo, but it showing that my git push is rejected. why? image

Did you try git pull before making the changes?

@pranjal6314
Copy link
Collaborator

@Vivekrathore2002 first do pull request because there is many changes on github repo
use git pull

@Vivekrathore2002
Copy link
Collaborator

@Vivekrathore2002 first do pull request because there is many changes on github repo use git pull

Sure i will take care of that

@bholebaba0135
Copy link
Owner Author

@everyone, click on contribute -> open pull request from your own branch if you are done adding methodology. I will merge it then. Dont merge yourself

@pranjal6314
Copy link
Collaborator

done

@asrathore257
Copy link
Collaborator

image

i'm facing this issue

@pranjal6314
Copy link
Collaborator

wait for some time then run "git pull" then do git push

@asrathore257
Copy link
Collaborator

okay I will try it

@Vivekrathore2002
Copy link
Collaborator

image

i'm getting the same error as pranjal got.

@pranjal6314
Copy link
Collaborator

first check your all are in your own branch then push

@asrathore257
Copy link
Collaborator

okay done

@Vivekrathore2002
Copy link
Collaborator

image

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

No branches or pull requests

6 participants