Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
HW5-Q3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
yuxiliu
HW5-Q3
Compare revisions
main to a2c42d394b792a39e666d8b899042d019910bca3
Compare revisions
Changes are shown as if the
source
revision was being merged into the
target
revision.
Learn more about comparing revisions.
Source
yuxiliu/merging-confllict-exercise
Select target project
No results found
a2c42d394b792a39e666d8b899042d019910bca3
Select Git revision
Branches
feature-1
feature-2
main
Swap
Target
vinayavn/merging-confllict-exercise
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
main
Select Git revision
Branches
feature-1
feature-2
main
Show changes
Only incoming changes from source
Include changes to target since source was created
Compare
Commits on Source (4)
Modify main.cpp for feature 1
· 999caada
Vinay Angara
authored
2 months ago
999caada
Modify main.cpp for feature 2
· ac60ed31
Vinay Angara
authored
2 months ago
ac60ed31
Merge branch 'feature-1' into main
· 6e1fc170
yuxiliu
authored
2 months ago
6e1fc170
feature-2 added with combined changes
· a2c42d39
yuxiliu
authored
2 months ago
a2c42d39
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
main.cpp
+5
-1
5 additions, 1 deletion
main.cpp
with
5 additions
and
1 deletion
main.cpp
View file @
a2c42d39
...
...
@@ -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
This diff is collapsed.
Click to expand it.