Skip to content

Feature2 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rritesh1234 merged 3 commits into from
Jun 14, 2024
Merged

Feature2 #2

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f67513a
create merge conflict
1023Prachu Jun 14, 2024
5b38f59
create merge conflict to feature 2
1023Prachu Jun 14, 2024
ac92274
Merge branch 'main' into feature2
Rritesh1234 Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions script1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,8 @@ echo "We are trying this practical from linux EC2"
echo "We are from batch-24 and learning git/gihub"
echo "Happy weekend"
echo "ssss"
echo "we are modified this code in feature "
echo "we are learning branching strategies"
echo "hkj"
echo "uh;ob"
echo "jhkj;gytdk"
echo "jblbl"