Section 6.3.2 - Exercise 3 assumes user has already set up `git`

Open Beginner friendly
#963 0 comments 0 reactions 0 assignees View on GitHub

Nobody has claimed this yet.

Assessment

Difficulty
1/5
Estimated time
Under an hour
Newbie friendliness
78/100
Issue type
Documentation
Clarity
Clearly specified
Activity status
Active
Tech stack
git
Domain
documentation

Research direction

Locate Section 6.3.2, Exercise 3 in the Git guide and review the instructions leading to the merge conflict. Update the exercise to account for users without a configured pull strategy, then verify the exercise works for a fresh Git setup and clearly explains the expected conflict state.

Written by the indexing model from the issue text.

Description

Exercise 3 states:

We have now created a problem. Git doesn't know which version of the file is the correct version to keep, generating a merge conflict. When viewing the file, you'll see both versions of the conflicting section surrounded by <<< and >>>. The two versions are separated in the center by ===.

This assumes the user has already configured a default for this,
and if they haven't (which is reasonable considering this is the git guide),
they will encounter the following:

hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint:
hint:   git config pull.rebase false  # merge
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.

Maybe this should be mentioned?

Dominant language
JavaScript
Stars
49
Forks
52
Avg merge
1d 7h
Merged PRs (30d)
30

Contributor guide

No contributing guide indexed for this repository

First steps

  1. Read the whole issue, then the project's contributing guide.
  2. Comment on the issue to say you are picking it up — it saves two people doing the same work.
  3. Fork the repository and make your change on a branch.
  4. Open a pull request that references the issue number.

More from liatrio/engineering-bootcamp

All issues in liatrio/engineering-bootcamp

Similar issues

More JavaScript issues

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.