govind-s-b / onepane_hackathon.git-hackathon Goto Github PK

Prerequisites
git
editor:  for code editing
github account
 

Task
    1. Fork this git repository.
    2. create new branch (branch name : second) from main (using cli command).
    3. add new file (filename <name>.txt) in newly created branch and push.
    4. create another branch from main branch (branch name : third), 
    5. append 'Hello Sethu' to default.txt file in 'third' branch then commit and push
    6. Switch to 'second' branch and append 'Hi <your-name>' in default.txt
    7. merge main and second branch
    8. merge main and 'third' branch, fix conflicts if any. (you can use vscode editor for fix merge conflict)
    9. create another 'fourth' from main branch and edit <name>.txt and commit
    10. pull the change that you made on 'fourth' branch by using cherry-pick


Document all the commands that you used this task and add to README file