Have more fun with Kudos
- Collect badges and make progress
- Participate in fun challenges
- Climb up the leaderboard
- Gift Kudos to your peers
Community resources
Community resources
Community resources
- Community
- Tag: conflict
Tag: "conflict"
-
Hello, using the Bitbucket CLOUD API: Is there a way to check if a pull request has any conflicting files - and if so, obtain a list thereof? Thanks in advance for any pointers!
-
Hi All, Using Jira Service Management, and the Jira Service Management ITSM Template, I'm wanting to edit/update the Change Calendar to visually show when there is a conflict between c...
-
I'm using Sourcetree v4.1.2 and I'm seeing this behavior when merging files. If I run from Terminal the `git mergetool path-to-file` command, FileMerge launches fine, I resolve conflicts and conflict...
- Sourcetree
- Question
- conflict
- merge
- sourcetree
-
-
...AT. But if there is conflict he need to resolve it. NOTE he cannot pull UAT into feature, because on UAT we have multiple features and if we decided to push only one feature from current sprint i...
672 views 1 0 Deleted user September 22, 2020 -
I would like to automate the process where creation of a Jira task with a given label say “Design” would create a new wiki template page say “Solution Design document template” for a given spac...
- Atlassian Automation
- Question
- automation
- conflict
- jira
-
-
I'm an artist. For years, I have had the habit of always Pulling before I Commit/Push. Till recently, I would Pull and if there was an incoming merge conflict, the Merge Conflict popup would show u...
- Sourcetree
- Question
- conflict
- merge
- sourcetree
-
-
Hi, May I know if any recommended merge tool can be easily integrated with SourceTree to resolve conflicts just like that in eclipse ? As I try to use beyond compare with SourceTree and it looks t...
- Sourcetree
- Question
- conflict
- sourcetree
-
-
When I have a PR without conflicts I can Squash to create a new commit from branch origin and just send that one commit to destination branch so if I revert I don't have all the commits made in b...
- Bitbucket
- Question
- bitbucket
- conflict
- git
- pull-request
-
-
How to resolve merge conflicts caused by multiple files in the same branch. There should be only one file for a branch. How to remove the unwanted files? Don't know how they got there in the first place!!!
- Sourcetree
- Question
- conflict
- merge
- sourcetree
-
-
...till causing merge conflicts if edited on 'both sides' of the merge. When manually creating a repository and adding the lines to .git/config it seems to work fine.
-
While merging my branch code with master, I was having merge conflicts and most of them got resolved but I'm unable to resolve merge conflicts on few files as I'm unable to accept the changes or s...
-
hi, Any option required to be activated for Auto-Merged to be able to resolve conflicts (to create the additional PR for fixing them) In my case it skip the merges into the release branches&n...
-
...ave some functionality which basically crawls up and down the dependency tree and based on the objects affected notifies certain people? To speak ITIL, this would be Impact Analysis. 3. Conflict C...
-
I found this: https://confluence.atlassian.com/bitbucket/resolve-merge-conflicts-704414003.html but there are no examples about "Deleted in source but modified in destination" I want to delete t...
- Bitbucket
- Question
- bitbucket
- bitbucket-server
- conflict
- server
-
-
Hi! I would like to know if theres a way to resolve conflicts in some folders without the user's intervention. A program is modifying some meta data and they have a conflict every time they try to p...
- Sourcetree
- Question
- conflict
- pull-request
- sourcetree
-
-
I am setting up a devops POC for my organiztation. We are using bitbucket as repository tool. Is there any tool come along with bitbucket for compare and merging? I downloaded sourcetree and cl...
- Bitbucket
- Question
- bitbucket
- conflict
- sourcetree
-
-
My pull request was approved, but it contained conflicts and when I hit "More information" link after the warning, the following popped up: This pull request has conflicts. You must r...
-
...he external merge tool (without saving the tmp file), SourceTree marks the conflicted file as resolved. I'm using WinMerge as a custom merge tool, with the command "C:\Program Files (x86)\WinMerge\W...
- Sourcetree
- Question
- bug
- conflict
- merge
-
-
Hi everyone, I would like to know what the best way to resume the Finish Feature functionnality after resolving all conflicts happening during the merge? Thanks
-
When using the Bamboo branch updater functionality I am constantly getting failed builds due to git merge conflicts in a file that contains the application version number. On developer PC's this i...
978 views 1 3 Deleted user August 2, 2016 -
Windows 10 SourceTree 1.8.1.0 system Git 1.9.5 P4Merge Rev. P4Merge/NTX64/2014.2/973065 When I resolve a conflict during a merge using P4Merge, when I close P4Merge after saving a r...
- Sourcetree
- Question
- conflict
- git
- sourcetree
- windows
-
-
I have committed a .jar file in my 1603 repository and created a pull request for the same.The pull request was approved and merged but is causing automatic merge conflict while merging from 1603 t...
-
...nto 3.1.2. So I did a merge and now I have 3 files with "conflicts": Screen Shot 2015-01-04 at 1.31.14 PM.png So, I look at each file on the right of SourceTree and I see this: Screen Shot 2...
- Sourcetree
- Question
- conflict
- git
- merge
-
-
We're currently using crucible but are evaluating stash, when a merge results in conflicts we upload the conflict resolution as a pre-commit generated by git show -m --no-prefix -w -U20 {merge-c...
- Bitbucket
- Question
- bitbucket-server
- conflict
-
-
One member of my team has a problem that none of the rest of the team has. It is as follows: They commit some work to local develop (ok) They pull from remote develop (ok) They get a merge conflict...
- Sourcetree
- Question
- branch
- conflict
- merge
- sourcetree
-
Copied to clipboard
- FAQ
- Community Guidelines
- About
- Privacy policy
- Notice at Collection
- Terms of use
- © 2025 Atlassian