Skip to content
This repository has been archived by the owner on Dec 10, 2023. It is now read-only.

Cherry-pick #126

Open
ABHAY0O7 opened this issue Jan 7, 2023 · 0 comments
Open

Cherry-pick #126

ABHAY0O7 opened this issue Jan 7, 2023 · 0 comments
Labels
Advanced Everyone Open for all, no need to claim Points: 40

Comments

@ABHAY0O7
Copy link
Member

ABHAY0O7 commented Jan 7, 2023

Before doing the task, read it completely and carefully.
You have to answer these two questions on two different branches such that both these branches should have only one commit.

Ques - 1 Which kind of development(s) do you do? (web/app/cc/etc).
Ques - 2 Resources that you follow to learn the above tech stacks (development)?
After answering each question, take a screenshot of the content of your info.md file and save it.

The title of the commit message for Ques - 1 is <GitHub username> - one. Ex:- ABHAY0O7 - one.
The title of the commit message for Ques - 2 is <GitHub username> - two.
The description of commit messages depends on you.

After making the commits, take a screenshot of the git log output in both the above branches and please save them.

Now, in a new branch, cherry-pick the above two commits in the reverse order i.e. if you answered the Ques-1 first then its, commit should be cherry-picked later and vice-versa.
Take the screenshot of cherry-picking's output for each commit and save them.
Also, remember that this new branch should not have any changes that you did during the task before cherry-picking.

Now, the main task is that while you were doing this whole task, you should never get any merge conflicts or any other conflicts.

After doing the task, just make a PR from the new branch.

Important points

  • No need to define anything. (neither in PR nor in info.md)
  • No need to write any commands.
  • I will be reviewing your PR on the Go-Git voice channel.
  • Only one PR is accepted, if you do anything wrong, then you have to correct it on that same PR and if you are unable to correct it then you can't do this task further.
  • Only two commits should be present in your PR.
  • Don't forget about the screenshots.

If your file is added in gitignore or doesn't exist on this repo then you can't do this task. To do it, follow your case

  • gitignore - if your file is added in gitignore, then just remove your file's path from the gitignore and make a commit to restore your file and then start this task.
  • new-comer - if you never contributed to this repo, then visit contributing.md and add your file and make a commit, after this start the task.
@ABHAY0O7 ABHAY0O7 added Advanced Everyone Open for all, no need to claim Points: 40 labels Jan 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Advanced Everyone Open for all, no need to claim Points: 40
Projects
None yet
Development

No branches or pull requests

1 participant