Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • prpandey/merging-confllict-exercise
  • zhangyee/merging-confllict-exercise
  • ljiawei/merging-confllict-exercise
  • jhengyi/merging-confllict-exercise
  • adbenard/merging-confllict-exercise
  • aryamanr/merging-confllict-exercise
  • kaushek/merging-confllict-exercise
  • glenntt/merging-confllict-exercise
  • yikuanx/merging-confllict-exercise
  • lucasdav/merging-confllict-exercise
  • sharifff/merging-confllict-exercise
  • parkcart/merging-confllict-exercise
  • homandat/merging-confllict-exercise
  • jacheamp/merging-confllict-exercise
  • harshpan/merging-confllict-exercise
  • rajatsm/merging-confllict-exercise
  • lyuyang/merging-confllict-exercise
  • liangkun/merging-confllict-exercise
  • haoweili/merging-confllict-exercise
  • kumbriac/merging-confllict-exercise
  • altmands/merging-confllict-exercise
  • chriswuc/merging-confllict-exercise
  • qhsun/merging-confllict-exercise
  • yuxiliu/merging-confllict-exercise
  • yusen/merging-confllict-exercise
  • maithgan/merging-confllict-exercise
  • kmrousso/merging-confllict-exercise
  • siddhawr/merging-confllict-exercise
  • maxgonza/merging-confllict-exercise
  • ptangsri/merging-confllict-exercise
  • hychan/merging-confllict-exercise
  • yuic/merging-confllict-exercise
  • vlandrum/merging-confllict-exercise
  • hkosak/merging-confllict-exercise-harrison-kosak
  • mahaoyu/merging-confllict-exercise
  • pohsun/merging-confllict-exercise
  • jessisc/merging-confllict-exercise
  • vinayavn/merging-confllict-exercise
38 results
Show changes
Commits on Source (4)
......@@ -2,6 +2,10 @@
#include <iostream>
int main() {
std::cout << "Original version in main branch" << std::endl;
<<<<<<< HEAD
std::cout << "This is Feature 1's version" << std::endl;
=======
std::cout << "This is Feature 2's version" << std::endl;
>>>>>>> feature-2
return 0;
}
\ No newline at end of file