Commits

Branch selector

 main

User selector

All users

Datepicker

All time

Commit History

Commits on Sep 19, 2023

• Merge pull request Zakariya-Shahid#1 from Zakariya-Shahid/PRBranch

  Show description for 1018d23
  Zakariya-Shahid

  authored
  1018d23

  Copy full SHA for 1018d23

• PR.txt file created for generating PR

  

  =

  committed
  010728d

  Copy full SHA for 010728d

• This is the change of stashing

  

  =

  committed
  8e7d995

  Copy full SHA for 8e7d995

• Edited the main-tw file to show rebasing

  

  =

  committed
  b3824cb

  Copy full SHA for b3824cb

• rebase.txt file has been created for rebasing process

  

  =

  committed
  32aa08f

  Copy full SHA for 32aa08f

• Conflict resolved

  

  =

  committed
  ecd693e

  Copy full SHA for ecd693e

• edited the main-tw file in main branch to create conflict

  

  =

  committed
  d6ed5e0

  Copy full SHA for d6ed5e0

• Edited main-tw.txt file to create confict in conflictBranch

  

  =

  committed
  45e5430

  Copy full SHA for 45e5430

• Merge branch 'merge-tw'

  

  =

  committed
  00996b2

  Copy full SHA for 00996b2

• main-tw file added for three way merging

  

  =

  committed
  a7439e9

  Copy full SHA for a7439e9

• merge-tw.txt file has been added

  

  =

  committed
  ef5c401

  Copy full SHA for ef5c401

• Merge-ff file has been created

  

  =

  committed
  c6a26a5

  Copy full SHA for c6a26a5

• Create UI_file.txt

  Zakariya-Shahid

  authored
  d86347c

  Copy full SHA for d86347c

• Changes made in the file.

  

  =

  committed
  a19cbb6

  Copy full SHA for a19cbb6

• The Lab1file.txt has been created.

  

  =

  committed
  7570562

  Copy full SHA for 7570562

• Initial commit

  Zakariya-Shahid

  authored
  03e0cb4

  Copy full SHA for 03e0cb4