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

Problem in format of a git answer #7016

Closed
NoamNol opened this issue Mar 28, 2024 · 1 comment · Fixed by #7081
Closed

Problem in format of a git answer #7016

NoamNol opened this issue Mar 28, 2024 · 1 comment · Fixed by #7081
Labels
good first issue Good for newcomers help wanted Extra attention is needed

Comments

@NoamNol
Copy link
Contributor

NoamNol commented Mar 28, 2024

- [x] 2
- [ ] 4
> In Git, there are two main ways to integrate changes from one branch into another: the merge and the rebase. [Reference](https://git-scm.com/book/en/v2/Git-Branching-Rebasing#:~:text=In%20Git%2C%20there%20are%20two%20main%20ways%20to%20integrate%20changes%20from%20one%20branch%20into%20another%3A%20the%20merge%20and%20the%20rebase)

@Ebazhanov Ebazhanov added help wanted Extra attention is needed good first issue Good for newcomers labels Mar 31, 2024
@singha04
Copy link

Merge: Merging is the process of combining code from two different branches. When you merge one branch into another, Git creates a new commit that combines the changes from both branches. This is the most common way of integrating changes in Git. Here's an example:

git checkout branchA #switch to branchA
git merge branchB #merge branchB into branchA

Rebase: Rebasing is another way of integrating changes from one branch to another. Instead of creating a new commit, rebasing moves the entire branch to a new base commit.

git checkout branchA #switch to branchA
git rebase branchB #rebase branchA onto branchB

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
good first issue Good for newcomers help wanted Extra attention is needed
Projects
None yet
Development

Successfully merging a pull request may close this issue.

3 participants