Merge a Team’s Changes is for Git beginners who want to combine contributions without losing useful work. Help a garden team deliver a complete visitor guide, then adapt the same workflow to a volunteer handbook.
Two Guided Labs move from an automatic merge to a conflict that needs a human decision. You will combine complementary facts from the same line, retain other updated pages and obtain the delivered files in a new receiving clone. One independent Challenge changes the handbook and reverses which contributor holds each correct fact. Every unit starts with its own prepared repositories.
What You Will Learn
- Understand a rejected push and fetch a teammate’s commits without replacing your working files.
- Read local and remote-tracking history, and merge independent contributions while preserving their original commits.
- Cancel an unfinished merge, resolve conflicting fields and retain pages that merged automatically.
- Publish a complete merge and obtain the same usable files from the shared repository in an independent clone.
Who This Course Is For
You should be comfortable entering terminal commands, navigating paths, and recognizing a commit, branch, git add, git commit and a basic diff. The course teaches remote names, fetching, pushing, cloning and merge conflicts. No programming or Git server administration is required.
A ready-to-use Linux Terminal includes Git and small text-file repositories. The editor, shared repository and receiving copy are directories on one training machine. Course documents are localized; file content, command output and the Terminal label remain English.
Frequently Asked Questions
Do I need GitHub or a remote server? No. You use real Git repositories with local paths. No external account, credentials, hosted service or server setup is needed.
Will I overwrite my teammate’s work? The task keeps both original contributions in history and combines their approved information. You practice recovery with an unfinished merge; force-pushing away a contribution does not satisfy the project.
How does the Challenge extend the Guided Labs? The independent handbook scene changes the files’ information and which side has the correct fields. It uses the same taught tools and conflict type, with clear preservation and delivery requirements.
How long does the course take? Allow about 120 minutes for two Guided Labs and one Challenge, including reading and ordinary mistakes. This is an author estimate, not timing measured with beginner learners.
