It's possible that when we try to perform a merge we encounter conflicts that prevent us from completing the action. This happens when there are commits with changes on the same lines of code in both branches.
Let's look at an example where we have two branches named branch_one and branch_two and we edit the same line of code in both branches. To do this:
- We create branch_one from master.
- We create branch_two from branch_one.
- We edit our code and make a commit in branch_two.
- We switch to branch_one and edit the same part of the code but with different changes. Then, we make a commit.
The result is a change in each branch made on the same line of code.
Continue reading
Access to all the content with our plans.
- Junior level content
- Senior level content
- Expert level content
- Extra content
- Question submissions
Monthly
Yearly
-
Unlimited access to the whole content
- Junior level content
- Senior level content
- Expert level content
- Extra content
- Question submissions
-
Unlimited access to the whole content
- Junior level content
- Senior level content
- Expert level content
- Extra content
- Question submissions
-
Solve your doubts at any level
- Junior level content
- Senior level content
- Expert level content
- Extra content
- 2 Question submissions per week
-
Solve your doubts at any level
- Junior level content
- Senior level content
- Expert level content
- Extra content
- 2 Question submissions per week
Be the first to comment