FlexSEA Wiki

A WEARABLE ROBOTICS TOOLKIT

User Tools

Site Tools


git

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
git [2020/04/12 20:43]
jfduval
git [2020/04/12 20:45] (current)
jfduval [Understanding merging]
Line 160: Line 160:
   * Look for the ''>>>''​ symbols indicating a conflict. ​   * Look for the ''>>>''​ symbols indicating a conflict. ​
   * Fix the conflict, remove the indicators.   * Fix the conflict, remove the indicators.
-  * ''​git add source.c''​+  * Call ''​git add source.c'' ​to let git know that you have fixed the conflict
   * ''​git commit -am "Fixed merged conflict, correct value is 200."''​   * ''​git commit -am "Fixed merged conflict, correct value is 200."''​
  
 +The easiest way to prevent a merge conflict is to push and and pull frequently. Merging a few hours of work is usually far easier than merging days worth of work.
  
 ==== Everything else ==== ==== Everything else ====
git.txt ยท Last modified: 2020/04/12 20:45 by jfduval