Skip to content

[Issue #2] Team Introduction Program — Collaborative C++ File #10

Description

@ik-awais

Objective

Build a Team Introduction Program in C++ where every Octagon member contributes exactly one function to a shared source file. When all 8 functions are merged, the program will run and print every member's personal introduction to the terminal.

This issue practices the full collaborative GitHub workflow on a real shared file.


Learning Outcomes

By completing this issue you will practise:

  • Pulling the latest main before starting work
  • Creating a feature branch correctly
  • Editing a shared file without breaking teammates' work
  • Writing a clean, descriptive commit message
  • Opening and reviewing a Pull Request
  • Resolving a merge conflict if one arises

File Location

Work on this single file:
programming-fundamentals/team_intro.cpp

Do not create a new file. Do not rename the file.


Member Assignments

Each member owns exactly one function and one main() call.

Member Function to fill Call to uncomment in main()
ik-awais contributor1() contributor1();
coder-Retro contributor2() contributor2();
Arshkhattak contributor3() contributor3();
p250045-SSR contributor4() contributor4();
SyedaEasha contributor5() contributor5();
talhazahoor39-collab contributor6() contributor6();
velanora contributor7() contributor7();
waleeja07-wk contributor8() contributor8();

What to Put Inside Your Function

Replace the TODO comment with exactly these four cout lines (use your own real values):

void contributorN() {
    cout << "------------------------------" << endl;
    cout << "Name        : Your Full Name"   << endl;
    cout << "GitHub      : your-username"    << endl;
    cout << "City        : Your City"        << endl;
    cout << "Fun Fact    : One sentence."    << endl;
    cout << "------------------------------" << endl;
}

Keep the dashes. They make the output readable when all 8 blocks print in sequence.


Git Workflow — Follow Every Step

Step 1 — Get the latest code

git checkout main
git pull origin main

Step 2 — Create your branch

git checkout -b your-name/team-intro

Examples:
ali/team-intro
easha/team-intro
arsh/team-intro

Step 3 — Edit the file

Open programming-fundamentals/team_intro.cpp.
Fill in only your assigned function.
Uncomment only your assigned call in main().

Step 4 — Commit and push

git add programming-fundamentals/team_intro.cpp
git commit -m "feat: add contributorN — Your Name intro"
git push origin your-name/team-intro

Replace N and Your Name with your actual number and name.

Step 5 — Open a Pull Request

  1. Go to github.com/ik-awais/Octagon
  2. Click Compare & pull request
  3. Title: feat: add contributorN — Your Name
  4. Assign ik-awais as reviewer
  5. Click Create pull request

Acceptance Criteria

  • Branch named your-name/team-intro
  • Only your assigned function is filled (no other function touched)
  • Only your assigned main() call is uncommented
  • Commit message follows the format above
  • PR assigned to ik-awais for review
  • Code compiles without errors

Fix Merge Conflict:

  1. Keep both blocks of code — your function AND their function
  2. Delete the <<<<<<<, =======, and >>>>>>> marker lines
  3. Save the file
  4. git add programming-fundamentals/team_intro.cpp
  5. git commit -m "fix: resolve merge conflict in team_intro"
  6. Push again

Rules reminder: Never push to main directly. Never edit another member's function. Never merge your own PR without a review approval.

Starter C++ File

Path: programming-fundamentals/team_intro.cpp

// ============================================================
//  Octagon — Team Introduction Program
//  Repository : github.com/ik-awais/Octagon
//  Issue      : #2
//  Description: Each member fills in their own function.
//               Together they form the team introduction.
// ============================================================
//
//  HOW TO CONTRIBUTE
//  -----------------
//  1. Find your assigned function below (contributorN).
//  2. Replace the TODO comment with your cout statements.
//  3. Uncomment your function call inside main().
//  4. Do NOT touch any other function or any other call.
//
// ============================================================

#include <iostream>
using namespace std;

// ── Member 1 ── ik-awais ─────────────────────────────────────
void contributor1() {
    // TODO (ik-awais): replace this comment with your intro
    // Example:
    // cout << "------------------------------" << endl;
    // cout << "Name        : Awais"            << endl;
    // cout << "GitHub      : ik-awais"         << endl;
    // cout << "City        : Islamabad"        << endl;
    // cout << "Fun Fact    : I love open source." << endl;
    // cout << "------------------------------" << endl;
}

// ── Member 2 ── coder-Retro ──────────────────────────────────
void contributor2() {
    // TODO (coder-Retro): replace this comment with your intro
}

// ── Member 3 ── Arshkhattak ──────────────────────────────────
void contributor3() {
    // TODO (Arshkhattak): replace this comment with your intro
}

// ── Member 4 ── p250045-SSR ──────────────────────────────────
void contributor4() {
    // TODO (p250045-SSR): replace this comment with your intro
}

// ── Member 5 ── SyedaEasha ───────────────────────────────────
void contributor5() {
    // TODO (SyedaEasha): replace this comment with your intro
}

// ── Member 6 ── talhazahoor39-collab ─────────────────────────
void contributor6() {
    // TODO (talhazahoor39-collab): replace this comment with your intro
}

// ── Member 7 ── velanora ─────────────────────────────────────
void contributor7() {
    // TODO (velanora): replace this comment with your intro
}

// ── Member 8 ── waleeja07-wk ─────────────────────────────────
void contributor8() {
    // TODO (waleeja07-wk): replace this comment with your intro
}

// ── Main ─────────────────────────────────────────────────────
int main() {

    cout << "============================================" << endl;
    cout << "       OCTAGON — TEAM INTRODUCTION          " << endl;
    cout << "   FAST NUCES | AI Cohort | 3rd Semester    " << endl;
    cout << "============================================" << endl;
    cout << endl;

    // Uncomment ONLY your own call when you fill your function.
    // contributor1();   // ik-awais
    // contributor2();   // coder-Retro
    // contributor3();   // Arshkhattak
    // contributor4();   // p250045-SSR
    // contributor5();   // SyedaEasha
    // contributor6();   // talhazahoor39-collab
    // contributor7();   // velanora
    // contributor8();   // waleeja07-wk

    cout << endl;
    cout << "============================================" << endl;
    cout << "         End of Team Introduction           " << endl;
    cout << "============================================" << endl;

    return 0;
}

After completing #1 only you're allowed to work on this Issue

Metadata

Metadata

Labels

all-membersWhen all the members of the repo are assigned the taskcollaborationIssues involving collaboration of membersenhancementNew feature or requestprogramming-fundamentalsInvolving fundamental concepts of a certain programming language

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions