Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
git-intro
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nallani, Abhishikth (UG - Comp Sci & Elec Eng)
git-intro
Merge requests
!1
added how i am feeling
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Merged
added how i am feeling
develop
into
main
Overview
0
Commits
2
Pipelines
0
Changes
1
Merged
added how i am feeling
Nallani, Abhishikth (UG - Comp Sci & Elec Eng)
requested to merge
develop
into
main
9 months ago
Overview
0
Commits
2
Pipelines
0
Changes
1
issue 1
0
0
Merge request reports
Viewing commit
7c8ff86a
Prev
Next
Show latest version
1 file
+
3
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
7c8ff86a
Merge branch 'main' into 'develop'
· 7c8ff86a
Nallani, Abhishikth (UG - Comp Sci & Elec Eng)
authored
9 months ago
# Conflicts: # hello.py
hello.py
+
3
−
1
View file @ 7c8ff86a
Edit in single-file editor
Open in Web IDE
print
(
"
Hello World
"
)
<<<<<<<
hello
.
py
print
(
"
Hello World, Abhi
"
)
print
(
"
I am feeling happy today
"
)
>>>>>>>
hello
.
py
Loading