[FW][IMP] CRM: updating flow and screenshots about lead mining

[fw-bot]

Task: 2543815
Cherry pick from #998

Omitted changes proposed in the track_leads directory (e.g. lead_scoring.rst + image folder). Both the content and image updates were already pushed from another PR so what was proposed on #998 was outdated and no longer necessary.

What’s left over are the original proposed changes in #998, within the acquire_leads directory which include updates to lead_mining.rst and corresponding image files.

On top of these proposals, I went ahead and made the following changes:

• renamed the image files in the acquire_leads asset directory, since they were using outdated naming convention (e.g. LM1.png, LM6.png, LM7.png)
• cleaned up RST formatting issues (headings, line breaks, lists, broken links, guilabels, etc.)
• rewrote select content to be more concise and follow content guidelines. You can see the first version of proposals here to compare the changes made.

Forward-Port-Of: #2535

[robodoo]

Pull request status dashboard.

[fw-bot]

@StraubCreative @AntoineVDV cherrypicking of pull request #2535 failed.

stdout:

Auto-merging content/applications/sales/crm/acquire_leads/lead_mining.rst
CONFLICT (content): Merge conflict in content/applications/sales/crm/acquire_leads/lead_mining.rst

stderr:

16:55:01.154077 git.c:455               trace: built-in: git cherry-pick 4af536d1db36fb363a7f6d401434d402dd6d8f39
error: could not apply 4af536d1... [IMP] CRM: updating flow and screenshots about lead mining
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

[StraubCreative]

Hi @AntoineVDV

Tagging you here for a quick review to make sure I did this right.

What I did on dc81ab2:

• started on 15.0-14.0-crm-lead-mining-vpk-2--Coj-fw
• cherry-picked 4af536d on top of it --> merge conflict (just like the readout above)
• replaced the contents of the merge conflicted file (lead_mining.rst) with the updated content from [IMP] CRM: updating flow and screenshots about lead mining #2535
• squashed the two commits + rebased 15.0 underneath it
• force pushed back up here

Thanks and please let me know when you have a moment 🙏

[AntoineVDV]

Hi @AntoineVDV

Tagging you here for a quick review to make sure I did this right.

What I did on dc81ab2:

• started on 15.0-14.0-crm-lead-mining-vpk-2--Coj-fw
• cherry-picked 4af536d on top of it --> merge conflict (just like the readout above)
• replaced the contents of the merge conflicted file (lead_mining.rst) with the updated content from [IMP] CRM: updating flow and screenshots about lead mining #2535
• squashed the two commits + rebased 15.0 underneath it
• force pushed back up here

Thanks and please let me know when you have a moment pray

Hi, yes that's the general idea, but you added extra steps.

The fw-bot already performs the cherry-pick of 4af536d, so you don't need to do it again. It changes nothing to the conflict to resolve but it does add an extra commit to squash later as you saw.

In general, you could just:

1. checkout the fw branch locally
2. fix the conflict (look for the <<<<<<<, ======, ... pattern in conflicting files)
3. commit amend and force-push
4. r+ yourself

[AntoineVDV]

@robodoo r+