Skip to content

Merge v2 #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Jan 22, 2025
Merged

Merge v2 #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a77c041
Adding merge v2 info
pinkeshmars Jan 3, 2025
dfdfe67
minor changes
pinkeshmars Jan 6, 2025
379539e
Added visuals
pinkeshmars Jan 8, 2025
ead8bb8
Added visuals
pinkeshmars Jan 8, 2025
a73d019
merge legacy merge sections
pinkeshmars Jan 8, 2025
cc92f6f
minor corrections
pinkeshmars Jan 10, 2025
d551dc8
minor corrections
pinkeshmars Jan 10, 2025
4784f8e
Added links
pinkeshmars Jan 10, 2025
92a067b
Merge branch 'main' into feature/merge-v2
PoojaB26 Jan 14, 2025
4aea718
Apply suggestions from code review
PoojaB26 Jan 14, 2025
1c0a6ef
fix
pinkeshmars Jan 16, 2025
5295dbd
Added visuals
pinkeshmars Jan 16, 2025
05fd5ce
Added visuals
pinkeshmars Jan 20, 2025
59a3115
Merge branch 'main' into feature/merge-v2
leighajarett Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
232 changes: 227 additions & 5 deletions docs/testing-deployment-publishing/branching-collaboration/branching.md
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added ...esting-deployment-publishing/branching-collaboration/imgs/accept-all-from-one-branch.avif
View file
Open in desktop
Binary file not shown.
Binary file added ...-deployment-publishing/branching-collaboration/imgs/accept-specific-change-from-file.avif
View file
Open in desktop
Binary file not shown.
Binary file added docs/testing-deployment-publishing/branching-collaboration/imgs/bulk-accept.avif
View file
Open in desktop
Binary file not shown.
Binary file added docs/testing-deployment-publishing/branching-collaboration/imgs/change.avif
View file
Open in desktop
Binary file not shown.
Binary file added docs/testing-deployment-publishing/branching-collaboration/imgs/child-parent.avif
View file
Open in desktop
Binary file not shown.
Binary file added docs/testing-deployment-publishing/branching-collaboration/imgs/conflict.avif
View file
Open in desktop
Binary file not shown.
Binary file added docs/testing-deployment-publishing/branching-collaboration/imgs/merging-window.avif
View file
Open in desktop
Binary file not shown.
Binary file added docs/testing-deployment-publishing/branching-collaboration/imgs/parent-child.avif
View file
Open in desktop
Binary file not shown.
Binary file added docs/testing-deployment-publishing/branching-collaboration/imgs/yaml-validation-error.avif
View file
Open in desktop
Binary file not shown.
Loading