Collaboarative Development
My team has been working very hard on new features for our flag printing program! I wonder how they'll work together?
Getting Start
Here 3 branches in a working process without main branch, so our job is to do merge all the branches to the main branch and print out the flag.py file.
-
download the file and open the .git folder. find the username and email for connect with the git branch. connect to the git branch
1
git config --global user.name 'username' git config --global user.email 'email'
-
Here I follow one thing. I have created an another branch called pran and merge all the other three branches to it and then merge the pran branch to the main branch .
-
you need to know those things like git commit and merge.
First go to the ./git main folder and type git branch -a. you will show a the main branch along with the side three branches. - type git branch
1
2
3
4
5
6
Completing local head
HEAD feature/part-1 feature/part-3 pran
ORIG_HEAD feature/part-2 main
Completing recent commit object name
8395824 -- [8395824] add part 3 (1 year, 1 month ago)
same way feature/part-2,3 also be merged .
after all has been merged, type git log . you will see all the merge you have created. then switch to main branch type git switch main . then merge the pran branch -> main branch type git merge pran
then type python3 flag.py . you will get your flag.
1
2
3
Printing the flag...
picoCTF{t3@mw0rk_m@k3s_th3_dr3@m_w0rk_2c91ca76}