Skip to content
New issue

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

#

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

Already on GitHub? # to your account

conflict #6

Merged
merged 2 commits into from
Dec 8, 2023
Merged

conflict #6

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e21779
readmeee
dev-dwr Dec 8, 2023
c497397
Merge branch 'main' into conflict-1
dev-dwr Dec 8, 2023
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@ Connecting to Github(Gh) repository via SSH on Windows, tutorial: https://www.yo
* remote branch - this is branch with our code in github's servers
* After code review which was successful, we can merge from our feature branch to main branch. After merging we should clean after ourself.
1. git branch -d MOBILE-x_my_feature_branch -> deletes our local branch
2. git push origin --delete MOBILE-x_my_feature_branch -> deletes our remote server branch
2. git push origin --delete MOBILE-x_my_feature_branch -> delete our remote branch