1
Answer

How to avoid missing parts functions of code when push changes on git

Photo of ahmed elbarbary

ahmed elbarbary
1d
57
1

I work on source control git I have issue missing function PRINT_DEGREE_EQUATION_Both_Lang on jQuery .

Current Work and Issue:

I am working with Git for source control.

I found an issue with the function PRINT_DEGREE_EQUATION_Both_Lang.

File and Developer Details:

The function is in the jQuery file MasterScript.js.

This function was initially published by developer Sim.

When I searched for the same function in the changes pushed later by developer Reh, I could not find it in Git source control.

Preventing Differences Between Publishes:

How can we avoid discrepancies between two publishes in Git?

The file MasterScript.js contains the function PRINT_DEGREE_EQUATION_Both_Lang, and it may have been modified by 3 or 4 developers simultaneously.

function PRINT_DEGREE_EQUATION_Both_Lang(P_REQ_ID, P_User, P_LANG, userType, P_DB_PROD_TEST_FLAG, permId) {
    debugger;
    if (P_REQ_ID == null || P_REQ_ID === undefined)
        P_REQ_ID = $("#txtP_REQID").val();

    userType = userType ?? null;
    P_DB_PROD_TEST_FLAG = P_DB_PROD_TEST_FLAG ?? null;
    var rptParams = {
        P_REQ_ID: P_REQ_ID,
        P_User: P_User ?? $("#txtP_USER_ID").val(),
        P_LANG: P_LANG ?? (MYLang.ReturnLang() == "ar-KW" ? "AR" : "EN"),
        userType: userType,
        P_DB_PROD_TEST_FLAG: P_DB_PROD_TEST_FLAG,
        tenantId: "MOHE",
        permId: permId,
        userId: P_User ?? $("#txtP_USER_ID").val(),
    };
    $('#hidden_RptParams').val(JSON.stringify(rptParams));
    DownloadReportFromReportsViewer(6, '#hidden_RptParams');
}

 

this is picture from issue happened

Answers (1)

Next Recommended Forum