The Atlassian Community Forums are currently in read-only mode. We will be relaunching on a new platform on September 22 (read more here). We apologize for the extended downtime. For concerns or questions, please email communitymanagers@atlassian.com. See you on the other side, on the new Atlassian Community Forums! :)
× Create
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for
Community resources
Community resources
Community resources
How to resolve merge conflicts when moving from INT branch to master branch
cpotti
March 27, 2019 edited
Hi
We are using release system in our company. When we did first release and merged the code to master through pull request it went through smoothly. But when we did second merge of the release there were conflicts because same files merged to master in previous release.
The solution we did to resolve it is to remove previous release commit in master and merge the latest release merge.
What is the correct approach to merge code from one release to another in master and when there are common files without deleting previous commit in master and not to merge manually in master when there is merge conflict
0 answers
Comments for this post are closed
Community moderators have prevented the ability to post new answers.
Copyright © 2026 Atlassian