# Merging after a Change has already been made

**URL:** <https://community.postman.com/t/merging-after-a-change-has-already-been-made/9773>\
**Category:** Help Hub\
**Tags:** versioncontrol, fork-and-merge\
**Created:** [December 23, 2019, 4:07pm UTC](https://community.postman.com/t/merging-after-a-change-has-already-been-made/9773 "2019-12-23T16:07:31Z")\
**Posts on this page:** 4\
**Page:** 1

<div class="post-metadata">

**Author:** ![LiamC](https://avatars.discourse-cdn.com/v4/letter/l/7ab992/32.png) [@LiamC](https://community.postman.com/u/LiamC)\
**Post date:** [December 23, 2019, 4:07pm UTC](https://community.postman.com/t/merging-after-a-change-has-already-been-made/9773/1 "2019-12-23T16:07:31Z")

</div>

Hi there, I’m having an issue with version control in Postman. I’m using the Free version, so that may be the cause of the struggle but I haven’t been able to find out if that’s the case, yet.

**Issue:**

**Origin Collection has 2 Forks with a Tester 1 tag and a Tester 2 tag.**

**Tester 1 merges a change to the Origin collection.**  
**Tester 2 doesn’t have this change, but needs to merge their change to the Origin collection.**

**When Tester 2 comes to “Pull Changes” from the Origin collection, so both changes from Tester 1 and Tester 2 can be merged together in the Origin collection, this isn’t possible.**

**"Pull Changes" seems to make you pick the Changes made in Origin, _OR_ add the changes from Tester 2 which will undo the changes initially made by Tester 1.**

**Why can’t I Pull changes and Add Tester 2’s changes on top of Tester 1’s changes?**

I’ve searched articles/blogs, GitHub and Youtube and I can’t seem to find this even brought up anywhere so I figured I must be missing something that everyone else has no issue with. (Tell a lie, I did find a Youtube video explaining Fork + Merge, and they do the same thing I’ m trying to do and it didn’t work and they blamed it on connection issues…so…yeah.)

Any advice/help? Would be really appreciated as I don’t see the point using Fork & Merge if I can’t get this to work.

---

<div class="post-metadata">

**Author:** ![arlem](https://sea2.discourse-cdn.com/getpostman/user_avatar/community.postman.com/arlem/32/3078_2.png) [@arlem](https://community.postman.com/u/arlem)\
**Post date:** [December 23, 2019, 4:25pm UTC](https://community.postman.com/t/merging-after-a-change-has-already-been-made/9773/2 "2019-12-23T16:25:02Z")

</div>

Hi @LiamC,

Could you give more details on the type of changes Tester 1 and Tester 2 are doing? I just tried running the scenario you describe with Tester 1 changing the request type and Tester 2 adding a body and I was able to pull the changes from Origin before merging the changes from Tester 2 without any problem.

---

<div class="post-metadata">

**Author:** ![LiamC](https://avatars.discourse-cdn.com/v4/letter/l/7ab992/32.png) [@LiamC](https://community.postman.com/u/LiamC)\
**Post date:** [December 23, 2019, 4:48pm UTC](https://community.postman.com/t/merging-after-a-change-has-already-been-made/9773/3 "2019-12-23T16:48:57Z")

</div>

## Sure, so here is what Origin looks like: ![image](https://us1.discourse-cdn.com/getpostman/original/3X/5/c/5c438a7591cae4532524455c5ab7f6b02633f886.png)

## Tester 1’s Changes, literally a comment line: ![image](https://us1.discourse-cdn.com/getpostman/original/3X/6/4/6467e3260e0992add5934b53ac503bd70b562285.png)

## Merge these changes to the Origin: ![image](https://us1.discourse-cdn.com/getpostman/original/3X/9/2/92708d59a77608795533714d87a7016fcf0e4266.png)

## Tester 2 wants to merge their changes made to the origin too: ![image](https://us1.discourse-cdn.com/getpostman/original/3X/5/2/52263e3d81a03242b20afa7a92b74cdb72234133.png)

## Conflict, requires Tester 2 to Pull the changes made by Tester 1: ![image](https://us1.discourse-cdn.com/getpostman/original/2X/d/d976bcacd542d7f7cb136743ef04054c34c72d34.png)

Whichever change you pick Source OR Destination, it will get rid of the other and when you click Pull, it’ll overwrite whatever change you didn’t pick, for example - now the Origin will ONLY have Tester 2’s changes:

 ![image](https://us1.discourse-cdn.com/getpostman/original/2X/c/c373d5ec5b337365f572e0c85c4a105891b01f24.png)

I must be missing something, because ‘Pull Changes’ basically does nothing for me right now except overwrite something.

Postman’s official video demo-ing this couldn’t even do it on screen, and instead said it was down to a connection issue:  
 ![](https://img.youtube.com/vi/pnq22Urr2mM/maxresdefault.jpg)https://www.youtube.com/embed/pnq22Urr2mM?feature=oembed&wmode=opaque&list=LL5B1fQghLddVRKXoWrlomzA&start=2242  
Around @26:00 in the video.

---

<div class="post-metadata">

**Author:** ![arlem](https://sea2.discourse-cdn.com/getpostman/user_avatar/community.postman.com/arlem/32/3078_2.png) [@arlem](https://community.postman.com/u/arlem)\
**Post date:** [December 24, 2019, 9:37am UTC](https://community.postman.com/t/merging-after-a-change-has-already-been-made/9773/4 "2019-12-24T09:37:08Z")

</div>

This is indeed not feasible as we don’t handle merging the content of a file yet. I have opened a feature request here, feel free to complete if I have missed anything. 🙂

> <https://github.com/postmanlabs/postman-app-support/issues/7841>
>
> Posting on behalf of a user: https://community.getpostman.com/t/merging-after-a-…change-has-already-been-made/9773/3
> 
> \*\*Is your feature request related to a problem? Please describe.\*\*
> When two forks of a collection are making changes to the same file (ie. Tests scripts or Pre-request scripts), when the second one will try to merge they will only be given the choice of either overwriting the destination file with their source or the other way around. There is no way to keep both source and destination.  
> 
> \*\*Describe the solution you'd like\*\*
> When this happens, the user should be able to keep both source and destination as it happens when merging files on Github for example.
> 
> \*\*Describe alternatives you've considered\*\*
> A workaround would be do manually merge the contents in an outside editor then do a new push but we shouldn't have to leave the tool to do that. 
> 
> \*\*Additional context\*\*
> More context and screenshots on Discourse: https://community.getpostman.com/t/merging-after-a-change-has-already-been-made/9773/3
