Project1 - Manuel Alva

[barrera77]

Branch Differences & Conflict Resolution

1. Differences Found (via PR Diff Tool)

• Background & Layout: The jose-branch introduced a LinearGradient background (#031A62 → #00A3FF) replacing the previous solid purple background in HEAD.
• Component Name: Changed from LoginPurple → LoginBlue.
• Login Button: José’s branch changed the button color to blue (#00A3FF), while HEAD used orange (#FF8700).
• Imports: LinearGradient was added in José’s branch.
• Minor style adjustments in container, labels, and error messages.

2. Changes Necessary to Fix Conflicts

• Merged José’s layout and design changes: adopted the gradient, spinner overlay, component name, and styling updates.
• Kept the login button color from HEAD (#FF8700) instead of José’s blue to preserve our design.
• Removed conflict markers (<<<<<<<, =======, >>>>>>>) manually.
• Verified functionality: authentication, input validation, and navigation were intact.

Summary:
All design improvements from José’s branch were incorporated except the login button color, which was intentionally preserved to match the intended design as per the task mockup. Conflict resolution was handled by combining “accept theirs” for layout updates and manual edits for the button.