by Ciro Santilli (@cirosantilli, 37)
The key to solve conflicts is:
You have to understand what are the two commits that touched a given line (one from master, one from features), and then combine them somehow.
Or in other words, at every rebase conflict we have something like:
master-commit    feature-commit
|                |
|                |
base-commit------+
|
|
Therefore there are 2 diffs that you have to understand and reconcile:
  • base-commit to master-commit
  • base-commit to feature-commit

Ancestors (11)

  1. Merge conflicts
  2. Git tips
  3. Git
  4. List of version control systems
  5. Version control
  6. Software
  7. Computer
  8. Information technology
  9. Area of technology
  10. Technology
  11. Home

View article source

Discussion (0)

+ New discussion

There are no discussions about this article yet.

Articles by others on the same topic (0)

There are currently no matching articles.
See all articles in the same topic + Create my own version