|
Post by account_disabled on Dec 7, 2023 3:57:53 GMT
We have to remember that while we are developing our features in local environment the team is also working on other tasks and we will most likely agree on code files or configurations so we have to bring them to local environment so that we can pre-certify those possible conflict. <branch> Resolve conflicts if any. As we mentioned in the previous step we are likely to encounter conflicts. While making changes. Here are the steps to handle this task. Maybe you already have experience with this task. So just remember some tips. Identify conflicting files. Analyze it case by case and make Country Email List sure the changes you are about to accept are well validated. If you don't know whether to accept some code that doesn't belong to you, contact the developer who built the line of code. That conflicts with yours if possible. After conflicts are resolved, if it takes a long time, you may want to consider pulling again to ensure that the latest remote changes do not create additional conflicts. Run any changes you may have made. Except in special cases this is the method we use to install module libraries or patches. Since we brought in the changes made by the team it's likely.
|
|