# Source Control - Conflict Resolution **URL:** \ **Category:** Help Hub\ **Tags:** tests, automation\ **Created:** [March 27, 2025, 9:02pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765 "2025-03-27T21:02:15Z")\ **Posts on this page:** 10\ **Page:** 1
**Author:** ![priyankakulasekaran](https://avatars.discourse-cdn.com/v4/letter/p/d9b06d/32.png) [@priyankakulasekaran](https://community.postman.com/u/priyankakulasekaran)\ **Post date:** [March 27, 2025, 9:02pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/1 "2025-03-27T21:02:15Z")
Hello Multiple people from our team are contributing to API tests and we often encounter conflicts while merging our changes. I noticed that there are options either to keep source or destination but not both. I often end up forking a fresh collection and manually copy pasting my changes. I would like to know how others are handling such conflicts. ---
**Author:** ![danny-dainton](https://sea2.discourse-cdn.com/getpostman/user_avatar/community.postman.com/danny-dainton/32/29401_2.png) [@danny-dainton](https://community.postman.com/u/danny-dainton)\ **Post date:** [March 28, 2025, 3:51pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/2 "2025-03-28T15:51:13Z")
Hey @priyankakulasekaran 👋 Could you expand a little on your current workflow in your team, please? Are you raising PRs and Merging the changes once approved? There are a few options available, which option are you choosing? ![image](https://us1.discourse-cdn.com/getpostman/original/3X/c/c/cc7a16736928348caf570c989ea1ca817904dc8e.png) ---
**Author:** ![priyankakulasekaran](https://avatars.discourse-cdn.com/v4/letter/p/d9b06d/32.png) [@priyankakulasekaran](https://community.postman.com/u/priyankakulasekaran)\ **Post date:** [March 31, 2025, 1:50pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/3 "2025-03-31T13:50:23Z")
Hi @danny-dainton Yes, we are creating PRs and merging them after approval. We are selecting the 1st option in your screenshot - ‘Merge changes’ ---
**Author:** ![danny-dainton](https://sea2.discourse-cdn.com/getpostman/user_avatar/community.postman.com/danny-dainton/32/29401_2.png) [@danny-dainton](https://community.postman.com/u/danny-dainton)\ **Post date:** [March 31, 2025, 2:53pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/4 "2025-03-31T14:53:10Z")
Are changes from the destination always pulled before creating the PRs? The first 2 options do keep both the source and destination elements. Just _Merging the changes_ wouldn’t make any changes to the fork though so if you haven’t pulled any pending changes before merging, those would be updated in the fork. > **[Fork collections and environments in Postman | Postman Docs](https://learning.postman.com/docs/collaborating-in-postman/using-version-control/forking-elements/#merge-changes-from-a-fork)** > > Postman is a collaboration platform for API development. Postman's features simplify each step of building an API and streamline collaboration so you can create better APIs—faster. - **Merge changes** - Merge the changes into the parent element. This doesn’t make any changes to the fork. You must have Editor access to the parent element. - **Merge changes and update source** - Merge the changes into the parent element. Any differences in the parent element are also made to the fork. You must have Editor access to both the parent and forked elements. - **Merge changes and delete source** - Merge the changes into the parent element. After the merge process is complete, Postman deletes the fork. You must have Editor access to both the parent and forked elements. ---
**Author:** ![priyankakulasekaran](https://avatars.discourse-cdn.com/v4/letter/p/d9b06d/32.png) [@priyankakulasekaran](https://community.postman.com/u/priyankakulasekaran)\ **Post date:** [March 31, 2025, 4:25pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/5 "2025-03-31T16:25:05Z")
Yes. We always Pull Changes before creating/merging PRs. If there are conflicts when we pull changes, we see an option to either keep source or destination but not both. ---
**Author:** ![priyankakulasekaran](https://avatars.discourse-cdn.com/v4/letter/p/d9b06d/32.png) [@priyankakulasekaran](https://community.postman.com/u/priyankakulasekaran)\ **Post date:** [April 4, 2025, 8:58pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/6 "2025-04-04T20:58:50Z")
@danny-dainton Before creating a PR, I tried to pull changes from the source and this is what I see for conflict resolution ![image](https://us1.discourse-cdn.com/getpostman/original/3X/b/8/b899b31c360c0c4e8942dd47950890cb7d912a71.png) ![image](https://us1.discourse-cdn.com/getpostman/original/3X/0/2/02f9b8c6b3403606e7feb13867186b23cc7d3bbb.png) For both collection variables and Post Response script sections, I see options to either keep source or destination but not both. ---
**Author:** ![priyankakulasekaran](https://avatars.discourse-cdn.com/v4/letter/p/d9b06d/32.png) [@priyankakulasekaran](https://community.postman.com/u/priyankakulasekaran)\ **Post date:** [April 7, 2025, 7:21pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/7 "2025-04-07T19:21:21Z")
@danny-dainton Are you aware of an option that retains both source and destination in the conflict resolution process shared in the above screenshot? ---
**Author:** ![danny-dainton](https://sea2.discourse-cdn.com/getpostman/user_avatar/community.postman.com/danny-dainton/32/29401_2.png) [@danny-dainton](https://community.postman.com/u/danny-dainton)\ **Post date:** [April 7, 2025, 8:12pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/8 "2025-04-07T20:12:17Z")
In that context, there isn’t an option to keep both. Wouldn’t keeping both changes mean that the file stays in a conflicted state though? ---
**Author:** ![priyankakulasekaran](https://avatars.discourse-cdn.com/v4/letter/p/d9b06d/32.png) [@priyankakulasekaran](https://community.postman.com/u/priyankakulasekaran)\ **Post date:** [April 9, 2025, 2:05pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/9 "2025-04-09T14:05:44Z")
We face this issue when we add collection variables. We might want to retain all variables in both source and destination. ---
**Author:** ![danny-dainton](https://sea2.discourse-cdn.com/getpostman/user_avatar/community.postman.com/danny-dainton/32/29401_2.png) [@danny-dainton](https://community.postman.com/u/danny-dainton)\ **Post date:** [April 9, 2025, 2:08pm UTC](https://community.postman.com/t/source-control-conflict-resolution/77765/10 "2025-04-09T14:08:56Z")
As that is not an option in the _conflict resolution_ context, I would suggest raising a [new feature request](https://github.com/postmanlabs/postman-app-support/issues/new?template=feature_request.yml) on our Github Issue Tracker. 🙏