Skip to content

Git ex1/danishain #29

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
Danishain wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Git ex1/danishain #29

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4075426
start git ex1
Danishain May 11, 2022
47f126b
start - git ex1
Danishain May 11, 2022
7af07d9
start - git ex1 - finish part2
Danishain May 20, 2022
a525d22
finish ex1 git
Danishain May 25, 2022
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
41 changes: 41 additions & 0 deletions 07_git_exercises/danishain_ex1/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
...part 1 ...
2. green
Copy link
Owner

@alonitac alonitac Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file should appear red in PyCharm

3. blue
5. regular (text it's white after add&commit) before commit is green.
6. git deff
Copy link
Owner

@alonitac alonitac Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

git diff main

7. thr change that add new file
8. error: invalid option: --staged2
Copy link
Owner

@alonitac alonitac Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not exactly. Because there is no branch called staged2

9. git add avc.txt
11. git diff HEAD/master
12. echo >> abc.txt 3
13. no , because I didn't commit in working tree
14. because unstage the changes in my index.
Copy link
Owner

@alonitac alonitac Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because it has changes both in the index and working tree



...part 2 ...
1. git branch
2. git checkout -b feature/lamda_migration
3. git merge feature/version1
6. commit marge:
commit 7039afc5f06442e490bc202c1a47f2974be42c2c (HEAD -> feature/lambda_migration)
Merge: 1d07b58 5341a6b
Author: Daniel shainfeld <shainfeldd@gmail.com>
Date: Fri May 20 14:16:32 2022 +0300

Merge branch 'feature/version2' into feature/lambda_migration

# Conflicts:
# app.py

Copy link
Owner

@alonitac alonitac Jul 18, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question 6 in this section?

...part 3..

4. files: .env and config.json
5. no, because the commit saved to enother file and copy them . and also no have conflict.
Copy link
Owner

@alonitac alonitac Jul 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should care about the order when using cherry pick


...part 4...
1. touch take.txt
2. git add take.txt
3. I got smart checkout or force checkout and I choose the force and added only wha was not
5. no
6. delete the file and from working tree/