Skip to content

Monikakeerthana git and GitHub #4

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

Open
MONIKAKEERTHANA wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Monikakeerthana git and GitHub #4

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2cfe53f
Update git and github
MONIKAKEERTHANA Jul 21, 2023
5809a9b
Update git and github
MONIKAKEERTHANA Jul 21, 2023
bf33cce
Update git and github
MONIKAKEERTHANA Jul 21, 2023
7306008
Update git and github
MONIKAKEERTHANA Jul 21, 2023
e34d0df
Update git and github
MONIKAKEERTHANA Jul 21, 2023
71070e8
Update git and github
MONIKAKEERTHANA Jul 21, 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
32 changes: 32 additions & 0 deletions git and github
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,37 @@ git checkout monika
git add .
git commit -m "message"
git log
27) Never commit on main branch and creating your first pull request
for any new features you want to add, create a new pull request to merge it into main branch
28) Removing a commit from the pull request by force pushing
git log
git reset hashid
git status
git add .
git stash
git push origin monika - f
29) merging a pull request
30)Making forked project even with main project
we can fetch upstream button
git status
git log
git fetch --all --prune
git reset --hard upstream/main
git log
git push origin main
git pull upstream main
31)squashing your commits
whenever you create new branch it is created from head
git branch branchname
git checkout branchname// now head is pointing to the new branch
32)using the rebase command
git log
git rebase -i hashid
-i stands for interactive command
all the above commits, we can either pick or squash
all the squash commits are merged into one
git log
33)merge conflicts and how to resolve them?