Dictionary merging with conflict resolution - #525

Open

Frank2446-dotcom wants to merge 53 commits into

mainfrom

Dictionary-Merging-with-Conflict-Resolution

Commits on Dec 26, 2024

Updated group norms in README
Derekkarungani
committed
f0d4f36

Commits on Dec 27, 2024

Merge pull request #6 from MIT-Emerging-Talent/2-group-norms-readme
TibyanKhalid
authored
e42a2ef
Updated README.md with additional changes
Derekkarungani
committed
f4569b8
Updated README.md with additional changes
Derekkarungani
committed
6667d24
Fix Markdown formatting issues
Derekkarungani
committed
a92aa2a
Fix Markdown formatting issues
Derekkarungani
committed
0e9bd93
Fix Markdown formatting issues
Derekkarungani
committed
23920a1
I have made some changes in emojis, and added more details in the communication guidelines
TibyanKhalid
committed
c44f17f
Minor change to escape the md formatting error.
TibyanKhalid
committed
2104e4d
Added some punctuations
TibyanKhalid
committed
20de1b5
Edits for the md formatting checks
TibyanKhalid
committed
9232200
Some edits for md formatting error
TibyanKhalid
committed
61a9d65
Merge pull request #7 from MIT-Emerging-Talent/2-group-norms-readme
TibyanKhalid
authored
70bb6c9

Commits on Dec 28, 2024

Added communication.md in the collaboration folder
Frank2446-dotcom
committed
ceccb80
Initial commit
Kareiman
committed
a2e8656
Added communication.md in the collaboration folder
Frank2446-dotcom
committed
ba172e3
Added communication.md in the collaboration folder
Frank2446-dotcom
committed
aafe1e7
Merge pull request #8 from MIT-Emerging-Talent/communication
Emanfalouji
authored
ad9aa49
constraints.md
Kareiman
committed
3584d52
contraints updates
Kareiman
committed
3a4d54c
contraints update
Kareiman
committed
5f64d5e
contraints update
Kareiman
committed
09b8988
added learnig goals
AzzaOmer1
committed
7db6da6
edit formatting learnig goals
AzzaOmer1
committed
b1383b4
Merge pull request #11 from MIT-Emerging-Talent/learning_goals
safaabuzaid
authored
df526a9

Commits on Dec 29, 2024

branch updates
Kareiman
committed
cdceb02
Some minor edits
TibyanKhalid
committed
c85a7e9
Fix Markdown issues and push constraints.md
Kareiman
committed
20b968e
Fix Markdown formatting issues
Kareiman
committed
4dbe907
Fix Markdown formatting issue
Kareiman
committed
ad6d8df
Updated markdown content
Kareiman
committed
3abac60
Updated markdown content2
Kareiman
committed
701931b
Update constraints.md
Kareiman
authored
b9a4728
Update constraints.md
Kareiman
authored
3c21393
Update constraints.md
Kareiman
authored
ab8df39
Update constraints.md
Kareiman
authored
b731b5a
Updated markdown content2
Kareiman
committed
a0ac3fe
Updated markdown content2
Kareiman
committed
188760e
Updated markdown content2
Kareiman
committed
fb2191d
Updated markdown content2
Kareiman
committed
30c247f
Fixed
TibyanKhalid
committed
9ba43e3
Merge pull request #12 from MIT-Emerging-Talent/Fixing-branch
TibyanKhalid
authored
5aedefc
Updated markdown content2
Kareiman
committed
bd22c5f
Merge pull request #10 from MIT-Emerging-Talent/5-constraints
Kareiman
authored
ee96878

Commits on Dec 31, 2024

communication
Emanfalouji
committed
41dd260

Commits on Jan 1, 2025

Resolve conflict with upstream/main
TibyanKhalid
committed
66f6524
Merge pull request #22 from MIT-Emerging-Talent/Conflict_main
Derekkarungani
authored
dba8df3
Merge branch 'MIT-Emerging-Talent:main' into main
TibyanKhalid
authored
0459bab

Commits on Jan 2, 2025

edit it
AzzaOmer1
committed
4820930
Merge pull request #30 from MIT-Emerging-Talent/learning_goals
safaabuzaid
authored
dee5447

Commits on Jan 3, 2025

Add dictionary merge solution and related test
Frank2446-dotcom
committed
675d7e9

Commits on Jan 11, 2025

Updated comments and covered all reviews
Frank2446-dotcom
committed
5e555c6

Commits on Jan 15, 2025

Resolved issues in Dictionary-Merging-with-Conflict-Resolution branch
Frank2446-dotcom
committed
2be0563