| Chunk |
|---|
| Conflicting content |
|---|
return null; } <<<<<<< HEAD // At this point we've definitely found a path so we can uses the parent // references of the nodes to find out way from the target location back ======= // At this point we've definitely found a path so we can use the parent // references of the nodes to find a way from the target location back >>>>>>> 3a536f477cc6f271c0f517705656a093b906a573 // to the start recording the nodes on the way. // Using the minStepDistance field the path is reduced to a minimum of |
| Solution content |
|---|
return null;
}
// At this point we've definitely found a path so we can use the parent
// references of the nodes to find a way from the target location back
// to the start recording the nodes on the way.
// Using the minStepDistance field the path is reduced to a minimum of |
| File |
|---|
| PathFinder.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Comment |