Conflict Version Control Conflict Copyright © Software Carpentry 2010 This work is licensed under the Creative Commons Attribution License See http://software-carpentry.org/license.html for more information.
Welcome message from author
This document is posted to help you gain knowledge. Please leave a comment to let me know what you think about it! Share it to your friends and learn new things together.
Transcript
Conflict
Version Control
Conflict
Copyright © Software Carpentry 2010
This work is licensed under the Creative Commons Attribution License
See http://software-carpentry.org/license.html for more information.
Version Control Conflict
Version Control Conflict
revision 8
Version Control Conflict
revision 8 revision 8
revision 8
Name Orbital Radius ...Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...
Version Control Conflict
revision 8 revision 8 +
revision 9
Name Orbital Radius ...Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...
Version Control Conflict
revision 8 revision 9
revision 9
Name Orbital Radius ...Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 8 + revision 9
revision 9
Name Orbital Radius ...Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 8 + revision 9
revision 9
Name Orbital Radius ...Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 8 + revision 9
revision 9
Name Orbital Radius ...Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 8 + revision 9
revision 9
Name Orbital Radius ...Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 8 + revision 9
revision 10
Name Orbital Radius ...Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 10 revision 9
revision 10
Name Orbital Radius ...(10**3 km) ...
Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 10 revision 9
revision 11
Name Orbital Radius ...(10**3 km) ...
Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 11 revision 9
revision 11
Name Orbital Radius ...Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...
Version Control Conflict
revision 11 revision 9
revision 11
Name Orbital Radius ...* 10^3 KM ...
Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...
Version Control Conflict
revision 11 revision 9
revision 11
Name Orbital Radius ...* 10^3 KM ...
Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...
Version Control Conflict
revision 11 revision 9
revision 11
Name Orbital Radius ...* 10^3 KM ...
Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...
Version Control Conflict
revision 11 revision 9
revision 11
Name Orbital Radius ...(10**3 km) ...
Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 11 revision 9 +
revision 11
Name Orbital Radius ...*10^3 km ...
Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 11 revision 9 +
revision 12
Name Orbital Radius ...*10^3 km ...
Amalthea 181.4 ...Io 421.6 ...Europa 670.9 ...Ganymede 1070.4 ...Callisto 1882.7 ...himalia 11460 ...elara 11740 ...
Version Control Conflict
revision 11 revision 12
July 2010
created by
Greg Wilson
July 2010
Copyright © Software Carpentry 2010
This work is licensed under the Creative Commons Attribution License
See http://software-carpentry.org/license.html for more information.
Related Documents
