Skip to content

Commit

Permalink
Replaced external links with videos for squashing instructions.
Browse files Browse the repository at this point in the history
  • Loading branch information
kpmort97 committed Mar 11, 2025
1 parent 59ba61e commit 6c5950b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 6 deletions.
1 change: 0 additions & 1 deletion documenteer.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ ignore = [
'https://1password.com/downloads',
'athexapod.cp.lsst.org',
'https://curl.sai.msu.ru',
'https://www.datacamp.com/tutorial/git-squash-commits'
]

[sphinx]
Expand Down
19 changes: 14 additions & 5 deletions project/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,21 @@ that were created into a single commit, and merge our branch into the main proje
- Once the rebase is successful, **squash your commits** into a single commit to reduce clutter in the log of the obs-ops workflow.
- There are two options to use when squashing commits:

1. Visually using `Sourcetree <https://www.linkedin.com/pulse/how-squash-commit-using-source-tree-ardall-leonardo/>`_.
2. `Git Terminal Commands <https://www.datacamp.com/tutorial/git-squash-commits>`_ while in ticket branch.
1. Visually using **Sourcetree**:

.. vimeo:: 1063614564
:width: 100%

|
2. **Git Terminal Commands** while in ticket branch:

.. vimeo:: 1063607809
:width: 100%

a. Verify which commits you should squash using :command:`git log` to display them.
b. | Once the commits are squashed, force push them again:
| :command:`git push --force-with-lease`.
a. | Verify which commits you should squash using
| :command:`git log` to display them.
b. Once the commits are squashed, force push them again: :command:`git push --force-with-lease`.
* - 4.
- **Merge your ticket** branch into the main branch.
- In your terminal:
Expand Down

0 comments on commit 6c5950b

Please sign in to comment.