- Published
- Author
- Syed SibtainSystem Analyst
When we have conflicts between
1.
2. Create a new branch from
3. Pull latest changes from
4. Resolve conflicts
5. Push the changes and create a pull request with base branch as
6. And chill 🙂
main and production, we cannot open PR directly. We do the following:1.
git fetch and then go to production -> git checkout production2. Create a new branch from
production -> git checkout -b 3. Pull latest changes from
main -> git pull origin main or git merge main4. Resolve conflicts
5. Push the changes and create a pull request with base branch as
production6. And chill 🙂