Skip to content
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.

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

fixing titles #16

Merged
merged 1 commit into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ git push origin feature/blankets
- _Q.6._ What would be the result of the `git push` command if you didn't specify the branch name? Think of a situation where you need to explicitly state the name of the remote and why this situation might be useful.
- _Q.7._ In which cases would it be useful to have multiple remote repositories?

## 2. Locally merge the feature branch into the main branch
### 2. Locally merge the feature branch into the main branch

You want to include the additional items from the main branch in your feature branch. To do this, you need to merge the `feature/blankets` branch into the `main` branch.

Expand All @@ -102,7 +102,7 @@ git merge feature/blankets
- _Q.12._ How could you prevent a merge commit from being created when merging branches? Why would you want to do that?
- _Q.13._ What would have been the result if you had merged the `main` branch into the `feature/blankets` branch instead?

## 3. Resolve the merge conflict
### 3. Resolve the merge conflict

Oops! It seems Carol beat you to it and has already added some blankets to the list.

Expand Down Expand Up @@ -137,7 +137,7 @@ Open the `packing_list.md` file and resolve the merge conflict.
_Note_: You can also use a merge tool to resolve the conflict. E.g.: `git mergetool` or in IDEs like Visual Studio Code, you can use the built-in merge tool to resolve the conflict. It will show you the changes from both branches side by side, and you can choose which changes to keep.


## 4. Push the changes to the remote repository
### 4. Push the changes to the remote repository

Push the changes to the remote repository.

Expand Down
6 changes: 3 additions & 3 deletions README_solutions.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ git push origin feature/blankets
> **Solution Q.7**: Having multiple remotes can be useful when working with different teams or repositories. For example, you might have a remote repository for your team's work (e.g. on a private enterprise server) and another remote repository for open-source contributions (e.g. on a public platform like GitHub, GitLab, or Bitbucket). You can push and pull changes from different remotes depending on the context.
---

## 2. Locally merge the feature branch into the main branch
### 2. Locally merge the feature branch into the main branch

You want to include the additional items from the main branch in your feature branch. To do this, you need to merge the `feature/blankets` branch into the `main` branch.

Expand Down Expand Up @@ -155,7 +155,7 @@ git merge feature/blankets
> **Solution Q.13**: If there is no merge conflict, or you resolve the merge conflict in the same way (i.e. chose the same content) then the resulting state would be the same. However, what changes is which branch gets moved forward to the new commit: If you merge `main` into `feature/blankets` the `main` will still point to the same commit, but `feature/blankets` will be updated.
---

## 3. Resolve the merge conflict
### 3. Resolve the merge conflict

Open the `packing_list.md` file and resolve the merge conflict.

Expand Down Expand Up @@ -187,7 +187,7 @@ Open the `packing_list.md` file and resolve the merge conflict.

_Note_: You can also use a merge tool to resolve the conflict. E.g.: `git mergetool` or in IDEs like Visual Studio Code, you can use the built-in merge tool to resolve the conflict. It will show you the changes from both branches side by side, and you can choose which changes to keep.

## 4. Push the changes to the remote repository
### 4. Push the changes to the remote repository

Push the changes to the remote repository.

Expand Down