search

ACM-IGDTUW / Open-Source-Challenge

Advaya'20 The Open Source Challenge
8 stars 30 forks source link

command showing merge conflicts #56

Closed mishra-shruti96 closed 4 years ago

mishra-shruti96 commented 4 years ago

image

Please help me in resolving this...

sunitijain111 commented 4 years ago

command should be git checkout -b brachname, not git chekout branchname

lisa761 commented 4 years ago

Hi @mishra-shruti96, please do not update your fork using commands other than whats been mentioned in the task. The task asks you to run git fetch upstream and not git pull. Did you manage to rebase? And yes the command is git checkout -b brachname, and that's what is written in the Task as well :)

2020-04-15 (1)

Please follow the commands written in the tasks step by step, otherwise we wouldn't be able to help you out. Having merge conflicts can get really messy so lets avoid doing that.

lisa761 commented 4 years ago

Your merge conflicts are arising because like it says your branch and origin master have diverged. This maybe due to some commits or rebase that you have done on your own. You might have to completely reset your master using upstream to over come that. Please follow this step by step to do that. Do not add any commands on your own and you shall be fine. If you have forgotten your previous branch name, to checkout to that branch, please run git branch to view all your branches.

mishra-shruti96 commented 4 years ago

Your merge conflicts are arising because like it says your branch and origin master have diverged. This maybe due to some commits or rebase that you have done on your own. You might have to completely reset your master using upstream to over come that. Please follow this step by step to do that. Do not add any commands on your own and you shall be fine. If you have forgotten your previous branch name, to checkout to that branch, please run git branch to view all your branches.

Thank you @lisa761

mishra-shruti96 commented 4 years ago

Your merge conflicts are arising because like it says your branch and origin master have diverged. This maybe due to some commits or rebase that you have done on your own. You might have to completely reset your master using upstream to over come that. Please follow this step by step to do that. Do not add any commands on your own and you shall be fine. If you have forgotten your previous branch name, to checkout to that branch, please run git branch to view all your branches.

@lisa761 So firstly i have to reset master using the steps that you have provided and then i can start performing task 3...?

lisa761 commented 4 years ago

Yes, if you run into any errors, please tell us. Make sure to perform task - 2 before starting on 3.

mishra-shruti96 commented 4 years ago

Yes, if you run into any errors, please tell us. Make sure to perform task - 2 before starting on 3.

image

yes i have completed task 2 yesterday itself and now these are the results i am getting ... please have a look ..

lisa761 commented 4 years ago

Yes, that's correct. You can start working on 3 now.

lisa761 commented 4 years ago

Closing this. Fell free to re-open in case you need to add something.