##// END OF EJS Templates
rhodecode-enterprise-ce
RSS
git: use force fetch and update for target ref. This solves a case...
git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.
marcink - - Load All Authors

File last commit:

r1:854a839a default
r2784:e8c62649 default
Show More
review-diffs.rst
42 lines | 1.0 KiB | text/x-rst | RstLexer
/ docs / code-review / review-diffs.rst
History | Annotation | Raw |Copy content |Copy permalink

Reviewing Diffs

Diffs are representations of changes made between different changesets of a file. |RCE| provides 4 different types of diffs for each commit or changeset, and depending on your preference you can use whichever for code review purposes.

  • Plain diff
  • Full diff
  • Side-by-side diff
  • Raw diff

Reviewing Changes

|RCM| displays all code changes made with each commit. Removed content is marked in red and new content in green.

Plain Diff

Side-By-Side Diffs

To review code with a side-by-side diff, use the following steps:

  1. Open the repository in which you wish to review a file
  2. Select the revision you wish to review
  3. Select the side-by-side diff icon beside the file name
Side by side diff

Notifying Users

To notify other users of you comments, or requests for feedback, see :ref:`review-notifications-ref`