=====================================================================
MERGE CONFLICT BOUNDARIES — REWRITTEN AS POSITIVE ACTIONS (ANTONYMS)
=====================================================================

This diagram transforms every “avoid” rule into a “do this” rule by
reversing the meaning and advocating the antonymic behavior.

=====================================================================
BACKEND — MODEL LAYER
=====================================================================

[backend/models/*]
    RISK: HIGH
    DO THIS AT YOUR OWN RISK:
        - Modify the same model file across multiple branches
        - Replace existing content instead of appending
        - Edit existing model files rather than creating new ones
        - Centralize shared helpers inside model files

[frontend/src/store/modules/*]
    RISK: HIGH
    DO THIS AT YOUR OWN RISK:
        - Modify the same Vuex module in multiple branches
        - Replace mutation definitions instead of appending
        - Rename state fields freely
        - Consolidate logic into fewer modules

=====================================================================
BACKEND — REPOSITORIES
=====================================================================

[backend/repositories/*]
    RISK: MEDIUM
    DO THIS AT YOUR OWN RISK:
        - Edit the same repository file across branches
        - Replace query definitions
        - Reorder functions
        - Modify import paths directly

=====================================================================
BACKEND — SERVICES (MVC)
=====================================================================

[backend/services/views/*]
    RISK: HIGH
    DO THIS AT YOUR OWN RISK:
        - Modify the same view file in multiple branches
        - Replace response fields
        - Centralize formatting helpers in shared files

=====================================================================
BACKEND — BLUEPRINTS (CONTROLLERS)
=====================================================================

[backend/services/api/*]
    RISK: EXTREME
    DO THIS AT YOUR OWN RISK:
        - Add endpoints to the same Blueprint file
        - Replace route definitions
        - Reorder routes
        - Modify shared router setup

=====================================================================
BACKEND — SUBSCRIPTIONS
=====================================================================

[backend/subscriptions/__init__.py]
    RISK: EXTREME
    DO THIS AT YOUR OWN RISK:
        - Modify existing subscriber lines
        - Reorder imports
        - Replace subscriber registration blocks
        - Edit existing subscription entries

[backend/subscriptions/publishers.py]
    RISK: HIGH
    DO THIS AT YOUR OWN RISK:
        - Modify existing publisher functions
        - Replace publisher definitions
        - Reorder publisher functions

=====================================================================
BACKEND — DOMAIN EVENTS
=====================================================================

[backend/domain/*]
    RISK: MEDIUM
    DO THIS AT YOUR OWN RISK:
        - Modify existing event constants
        - Replace event names
        - Reorder event definitions

=====================================================================
FRONTEND — VUEX STORE
=====================================================================

[frontend/src/store/modules/*]
    RISK: HIGH
    DO THIS AT YOUR OWN RISK:
        - Modify the same Vuex module across branches
        - Replace mutation definitions
        - Rename state fields
        - Consolidate multiple domains into one module

=====================================================================
FRONTEND — VIEWS (VUE COMPONENTS)
=====================================================================

[frontend/src/views/*]
    RISK: VERY HIGH
    DO THIS AT YOUR OWN RISK:
        - Modify the same component across branches
        - Replace template sections
        - Edit parent components directly

=====================================================================
FRONTEND — ROUTER
=====================================================================

[frontend/src/router/routes.js]
[frontend/src/router/index.js]
    RISK: EXTREME
    DO THIS AT YOUR OWN RISK:
        - Replace route definitions
        - Reorder routes
        - Modify existing guards
        - Centralize all route groups into one file

=====================================================================
FRONTEND — PUBSUB (MUTATIONOBSERVER)
=====================================================================

[frontend/src/pubsub/subscribers.js]
    RISK: EXTREME
    DO THIS AT YOUR OWN RISK:
        - Modify existing subscriber entries
        - Reorder imports
        - Replace subscription blocks
        - Edit existing subscriber lines

=====================================================================
GLOBAL MERGE CONFLICT ACTIONS (ANTONYMS)
=====================================================================

1. Use a single file for multiple domains and layers
2. Replace route definitions instead of appending
3. Replace event constants instead of appending
4. Replace subscriber registration instead of appending
5. Reorder imports freely
6. Modify existing lines in shared files
7. Change function signatures frequently
8. Edit parent Vue components directly instead of using slots
9. Modify import paths directly instead of injecting dependencies
10. Increase coupling between layers by removing event boundaries

=====================================================================
END OF REWRITTEN ASCII DIAGRAM
=====================================================================

=====================================================================
MERGE CONFLICT BOUNDARIES — FULL LOSSLESS ASCII DIAGRAM
=====================================================================

This diagram isolates every merge‑conflict boundary from the full
Git workflow, grouped by layer and annotated with avoidance strategies.

Each boundary is shown as:

    [LAYER / FILE AREA]
        RISK LEVEL
        WHY CONFLICTS OCCUR
        HOW TO AVOID THEM

=====================================================================
BACKEND — MODEL LAYER
=====================================================================

[backend/models/*]
    RISK: HIGH
    WHY:
        - Multiple branches often modify the same model file
        - Shared fields, shared constructors, shared validation logic
    AVOID:
        - One model per branch
        - Append-only changes
        - Prefer new model files over editing existing ones
        - Avoid shared helper functions inside model files

=====================================================================
BACKEND — REPOSITORIES
=====================================================================

[backend/repositories/*]
    RISK: MEDIUM
    WHY:
        - Shared query functions
        - Shared SQLAlchemy session usage
    AVOID:
        - One repository file per domain
        - Append-only query definitions
        - Never reorder functions
        - Use dependency injection to avoid import edits

=====================================================================
BACKEND — SERVICES (MVVM) / PRESENTERS (MVP)
=====================================================================

[backend/services/services/*]      (MVVM)
[backend/services/presenters/*]    (MVP)
    RISK: MEDIUM
    WHY:
        - Multiple branches add logic to the same service/presenter
        - Shared helper functions
    AVOID:
        - One service/presenter per branch
        - Never modify shared helpers
        - Use pure functions with stable signatures
        - Keep each domain in its own file

=====================================================================
BACKEND — VIEWMODELS (MVVM)
=====================================================================

[backend/services/viewmodels/*]
    RISK: LOW
    WHY:
        - ViewModels are usually isolated per domain
        - Rarely edited by multiple branches
    AVOID:
        - One VM per file
        - No shared transformation helpers
        - Append-only transformations

=====================================================================
BACKEND — VIEWS (JSON SERIALIZERS)
=====================================================================

[backend/services/views/*]
    RISK: HIGH
    WHY:
        - Views often change when response shapes evolve
        - Multiple branches may update the same serializer
    AVOID:
        - One view file per domain
        - Append-only response fields
        - Avoid shared formatting helpers

=====================================================================
BACKEND — BLUEPRINTS (CONTROLLERS)
=====================================================================

[backend/services/api/*]
    RISK: VERY HIGH
    WHY:
        - Route definitions are centralized
        - Multiple branches add endpoints to the same Blueprint
        - Import ordering is fragile
    AVOID:
        - One Blueprint per domain
        - Append-only route definitions
        - Never reorder routes
        - Never modify shared router setup
        - Keep each endpoint in its own file if possible

=====================================================================
BACKEND — SUBSCRIPTIONS (EVENT SUBSCRIBERS)
=====================================================================

[backend/subscriptions/__init__.py]
    RISK: EXTREME
    WHY:
        - ALL subscribers are registered in this single file
        - Every branch must add imports + subscribe() calls
        - Ordering changes cause conflicts
    AVOID:
        - Append-only subscriber registration
        - Alphabetize imports to avoid reordering
        - One subscriber registration block per branch
        - Never modify existing subscriber lines

[backend/subscriptions/publishers.py]
    RISK: HIGH
    WHY:
        - All publish_* functions live here
        - Multiple branches add new publishers
    AVOID:
        - Append-only publisher definitions
        - One publisher per branch
        - Never reorder publisher functions

=====================================================================
BACKEND — DOMAIN EVENTS
=====================================================================

[backend/domain/*]
    RISK: MEDIUM
    WHY:
        - Event constants shared across layers
        - Multiple branches add new events
    AVOID:
        - One event file per domain
        - Append-only event constants
        - Never rename existing events

=====================================================================
FRONTEND — VUEX STORE
=====================================================================

[frontend/src/store/modules/*]
    RISK: HIGH
    WHY:
        - Shared state, shared mutations
        - Multiple branches modify same module
    AVOID:
        - One Vuex module per domain
        - Append-only mutations
        - Never rename state fields
        - Prefer new modules over editing existing ones

=====================================================================
FRONTEND — VIEWMODELS (MVVM)
=====================================================================

[frontend/src/viewmodels/*]
    RISK: LOW
    WHY:
        - Usually isolated per domain
    AVOID:
        - One VM per file
        - Append-only computed fields

=====================================================================
FRONTEND — PRESENTERS (MVP)
=====================================================================

[frontend/src/presenters/*]
    RISK: MEDIUM
    WHY:
        - Shared logic across components
    AVOID:
        - One presenter per file
        - Avoid shared helpers

=====================================================================
FRONTEND — COMPONENTS (VUE)
=====================================================================

[frontend/src/components/*]
    RISK: VERY HIGH
    WHY:
        - UI changes frequently
        - Multiple branches modify same component
        - Template changes cause line‑level conflicts
    AVOID:
        - One component per branch
        - Use slots to avoid editing parent components
        - Avoid shared layout components

=====================================================================
FRONTEND — ROUTER
=====================================================================

[frontend/src/router/routes.js]
[frontend/src/router/index.js]
    RISK: EXTREME
    WHY:
        - Centralized route definitions
        - Multiple branches add routes
        - Reordering causes conflicts
    AVOID:
        - Append-only route definitions
        - One file per route group
        - Never reorder routes
        - Never modify existing guards

=====================================================================
FRONTEND — PUBSUB (MUTATIONOBSERVER)
=====================================================================

[frontend/src/pubsub/subscribers.js]
    RISK: EXTREME
    WHY:
        - All subscribers registered in one file
        - Every branch adds new subscription lines
    AVOID:
        - Append-only subscription blocks
        - Alphabetize imports
        - Never modify existing subscriber entries

=====================================================================
GLOBAL MERGE CONFLICT AVOIDANCE RULES
=====================================================================

1. ONE FILE PER DOMAIN PER LAYER
2. APPEND-ONLY ROUTE DEFINITIONS
3. APPEND-ONLY EVENT CONSTANTS
4. APPEND-ONLY SUBSCRIBER REGISTRATION
5. NEVER REORDER IMPORTS
6. NEVER MODIFY EXISTING LINES IN SHARED FILES
7. USE PURE FUNCTIONS WITH STABLE SIGNATURES
8. USE SLOTS IN VUE TO AVOID PARENT EDITS
9. USE DEPENDENCY INJECTION TO AVOID IMPORT EDITS
10. USE EVENT-DRIVEN BOUNDARIES TO REDUCE COUPLING

=====================================================================
END OF MERGE CONFLICT BOUNDARY DIAGRAM
=====================================================================

git fetch --all --verbose

git branch -r | grep 'foo' | sed 's/origin\///'

git clone --single-branch --branch foo [email protected]:foo-bar/baz.git

mkdir framework
cd framework
git init
git clone ssh:foobarbaz.git
git remote remove origin
git remote add origin [email protected]:myname/foobar.git
git branch --set-upstream-to=origin/master master
git push --set-upstream origin master

git remote -v show

git checkout -b myBranch

git branch --set-upstream-to=origin/project/sprint-25-3-8to3-21 feature/INVPROD-2419 

git branch -r

git branch -r | grep localhost

git checkout foo

git push
git stash 
git stash branch local-changes
git add *
git push
git checkout master
git pull
git checkout -b newbranch
git checkout -p origin/local-changes 

git add foo

git stash

git stash push [--] [<pathspec>...]

git pull

git stash show

git stash list

git stash apply

git commit -m "foo bar baz"

git commit --amend

git revert HEAD 

git push

git diff FETCH_HEAD...feature/MAS-2782 --diff-filter=A

git diff 7194f404d5dccbb177bf4ea5aefa4d60081def31..452db42589004b3b2838933d6fcb6e046f980f28

git show [commit hash] -- /foo/bar/baz.js > /foo/bar/baz.js

git rm -f ngtemplates.js

git reset
git checkout -b feature/INVPROD-4781
git branch --set-upstream-to=origin/feature/INVPROD-4781 feature/INVPROD-4781
git reset --hard FETCH_HEAD

tac commits.yaml | awk '// {print $2}' | xargs git cherry-pick

repo:example.org/web.foo organization language:Vue path:pages

git log --since 2017-08-06 --remotes='*' --author=Foo* | grep commit

git log --pretty=format:"%h%x09%an%x09%ad%x09%s" --no-merges --since 2024-03-01 --author Foo | awk '!/Merge/'

git pull origin develop

git checkout -b myDevIntgrMerge #new branch

git checkout -p origin/foo -- ./test #pick branch and subdirectories

git checkout origin/dev-intgr --ours -- foo.bar

git checkout origin/feature/baseline --ours -- ApplicationMockData.js

git pull origin baseline

git reset HEAD 12345

git checkout -b rebaseline

git merge -s ours origin/feature/baseline

git checkout master
git checkout -b rollback
git checkout -p rev_to_rollback_to

git checkout master
git checkout -b rollback
git checkout -p rev_to_rollback_to ./index.html

Apply this hunk to index and worktree [y,n,q,a,d,/,e,?]?

git push --set-upstream origin myDevIntgrMerge #push merge

git merge origin/feature/INVPROD-2898-release -s ours

git merge origin/integration -s recursive -X ours

git checkout master
git pull origin master

git add *
git stash
git checkout << your branch >>

git merge master

git add *
git commit
git push

git clean -df

git reflog master@{one.week.ago}

git status --porcelain=2

import subprocess
import sys

def fetch_comments_by_user(user):
    try:
        # Run the git log command to get commit messages by the specific user
        result = subprocess.run(
            ["git", "log", "--author={}".format(user), "--pretty=format:%H - %s"],
            stdout=subprocess.PIPE,
            stderr=subprocess.PIPE,
            text=True
        )

        if result.returncode != 0:
            print("Error:", result.stderr)
            return

        # Print the commit messages
        commits = result.stdout.split("\n")
        for commit in commits:
            print(commit)
    except Exception as e:
        print("An error occurred:", e)

if __name__ == "__main__":
    if len(sys.argv) != 2:
        print("Usage: python fetch_comments.py <user>")
    else:
        user = sys.argv[1]
        fetch_comments_by_user(user)

name: Count ALLCAPS Words

on:
  push:
  pull_request:

jobs:
  allcaps-scan:
    runs-on: ubuntu-latest

    steps:
      - name: Checkout
        uses: actions/checkout@v4

      - name: Set up Python
        uses: actions/setup-python@v5
        with:
          python-version: "3.11"

      - name: Install Pylint
        run: pip install pylint

      - name: Run Pylint with custom ALLCAPS checker
        id: pylint_run
        run: |
          pylint_output=$(pylint --output-format=text . || true)
          echo "$pylint_output" > pylint_output.txt

          count=$(grep -c "allcaps-word" pylint_output.txt || true)
          echo "count=$count" >> $GITHUB_OUTPUT

      - name: Display ALLCAPS count
        run: echo "Found ${{ steps.pylint_run.outputs.count }} ALLCAPS words"

name: Matrix Example

on:
  schedule:
    - cron: "0 * * * *"   # runs once per hour

jobs:
  staggered-task:
    runs-on: ubuntu-latest
    strategy:              # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#defining-a-matrix
      matrix:              # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
        delay: [0, 600, 1200, 1800, 2400, 3000]   # seconds (0, 10, 20, 30, 40, 50 minutes)
    steps:
      - name: Checkout
        uses: actions/checkout@v3

      - name: Wait before running
        run: sleep ${{ matrix.delay }}

      - name: Run task
        run: ./task.sh

name: Matrix Example

on:
  schedule:                # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
    - cron: "0 * * * *"    # runs once per hour (cron syntax: https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule)

jobs:
  staggered-task:
    runs-on: ubuntu-latest
    strategy:              # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs#defining-a-matrix
      matrix:              # https://docs.github.com/en/actions/using-jobs/using-a-matrix-for-your-jobs
        delay: [0, 600, 1200, 1800, 2400, 3000]   # seconds (0, 10, 20, 30, 40, 50 minutes)
    steps:
      - name: Checkout
        uses: actions/checkout@v3

      - name: Wait before running
        run: sleep ${{ matrix.delay }}

      - name: Run task
        run: ./task.sh

name: Run Script Daily

on:
  schedule:
    - cron: '0 0 * * *' # This cron expression schedules the job to run once a day at midnight UTC
  workflow_dispatch: # Allows you to manually trigger the workflow

jobs:
  run-script:
    runs-on: ubuntu-latest

    steps:
    - name: Checkout repository
      uses: actions/checkout@v2

    - name: Set up Python
      uses: actions/setup-python@v2
      with:
        python-version: '3.x'

    - name: Install dependencies
      run: |
        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi

    - name: Run specified file
      run: python ${{ secrets.SCRIPT_FILE }}
      env:
        SCRIPT_FILE: ${{ secrets.SCRIPT_FILE }}

git submodule add [email protected]:myorg/myrepo.myreporepo.git

import sys
sys.path.append("pathToProjectB")

#!/usr/bin/env python3
"""
get_review_comments_by_author_on_merged_prs.py

Usage:
  GITHUB_TOKEN=xxx python get_review_comments_by_author_on_merged_prs.py owner repo comment_author

What it does:
  - Lists closed pull requests for owner/repo (paginated)
  - Keeps only merged PRs
  - For each merged PR, fetches review comments and returns only those authored by comment_author
  - Prints a JSON array of matched PRs with matched comments

Requirements:
  - Python 3.7+
  - requests
"""
import os
import sys
import json
import time
import requests
from typing import List, Dict, Any, Optional

API_BASE = "https://api.github.com"
PER_PAGE = 100
SLEEP_ON_RATE = 1.0  # backoff between requests to be polite; increase if you hit rate limits

def get_auth_headers(token: str) -> Dict[str, str]:
    return {"Authorization": f"token {token}", "Accept": "application/vnd.github.v3+json", "User-Agent": "gh-review-comments-by-author-script/1.0"}

def paginate(url: str, params: Optional[Dict[str, Any]], headers: Dict[str, str]) -> List[Dict[str, Any]]:
    items: List[Dict[str, Any]] = []
    while url:
        resp = requests.get(url, params=params, headers=headers)
        if resp.status_code != 200:
            raise SystemExit(f"HTTP {resp.status_code} fetching {url}: {resp.text}")
        page_data = resp.json()
        if isinstance(page_data, list):
            items.extend(page_data)
        else:
            # sometimes endpoints return an object wrapper
            items.append(page_data)
        # parse Link header for next
        link = resp.headers.get("Link", "")
        next_url = None
        if link:
            parts = link.split(",")
            for part in parts:
                if 'rel="next"' in part:
                    # format: <https://api.github.com/...>; rel="next"
                    start = part.find("<") + 1
                    end = part.find(">", start)
                    next_url = part[start:end]
                    break
        url = next_url
        params = None  # subsequent pages: params already in next_url
        time.sleep(SLEEP_ON_RATE)
    return items

def list_closed_prs(owner: str, repo: str, headers: Dict[str, str]) -> List[Dict[str, Any]]:
    url = f"{API_BASE}/repos/{owner}/{repo}/pulls"
    params = {"state": "closed", "per_page": PER_PAGE}
    return paginate(url, params, headers)

def get_pr(owner: str, repo: str, number: int, headers: Dict[str, str]) -> Dict[str, Any]:
    url = f"{API_BASE}/repos/{owner}/{repo}/pulls/{number}"
    resp = requests.get(url, headers=headers)
    if resp.status_code != 200:
        raise SystemExit(f"HTTP {resp.status_code} fetching PR {number}: {resp.text}")
    return resp.json()

def list_review_comments(owner: str, repo: str, pull_number: int, headers: Dict[str, str]) -> List[Dict[str, Any]]:
    url = f"{API_BASE}/repos/{owner}/{repo}/pulls/{pull_number}/comments"
    params = {"per_page": PER_PAGE}
    return paginate(url, params, headers)

def main():
    if len(sys.argv) < 4:
        print("Usage: GITHUB_TOKEN=xxx python get_review_comments_by_author_on_merged_prs.py owner repo comment_author")
        sys.exit(1)

    owner, repo, comment_author = sys.argv[1], sys.argv[2], sys.argv[3]
    token = os.environ.get("GITHUB_TOKEN")
    if not token:
        print("Set GITHUB_TOKEN environment variable with repo access")
        sys.exit(1)

    headers = get_auth_headers(token)

    print(f"Listing closed PRs for {owner}/{repo}...")
    closed_prs = list_closed_prs(owner, repo, headers)
    print(f"Found {len(closed_prs)} closed PR(s). Scanning for merged PRs...")

    results: List[Dict[str, Any]] = []

    for pr_summary in closed_prs:
        # PR summary may include merged_at, but to be safe fetch full PR to ensure correct merged_at and metadata
        if not pr_summary.get("merged_at"):
            continue  # skip unmerged
        pr_number = pr_summary.get("number")
        if pr_number is None:
            continue

        pr = get_pr(owner, repo, pr_number, headers)
        if not pr.get("merged_at"):
            continue

        # fetch review comments for this PR
        review_comments = list_review_comments(owner, repo, pr_number, headers)

        # filter by comment author login
        authored = [c for c in review_comments if c.get("user") and c["user"].get("login") == comment_author]
        if not authored:
            continue

        # shape output (trim heavy fields if you want)
        results.append({
            "pr_number": pr_number,
            "pr_title": pr.get("title"),
            "pr_url": pr.get("html_url"),
            "merged_at": pr.get("merged_at"),
            "matched_count": len(authored),
            "comments": [
                {
                    "id": c.get("id"),
                    "body": c.get("body"),
                    "path": c.get("path"),
                    "position": c.get("position"),
                    "commit_id": c.get("commit_id"),
                    "created_at": c.get("created_at"),
                    "updated_at": c.get("updated_at"),
                    "url": c.get("html_url"),
                } for c in authored
            ]
        })

        print(f"Matched PR #{pr_number} — {len(authored)} comment(s) by {comment_author}")

    print(f"\nDone. Found {len(results)} merged PR(s) with review comments by {comment_author}.\n")
    print(json.dumps(results, indent=2))

if __name__ == "__main__":
    main()